Commit de0c9cf96a0d34bb3b9f7e65853d7a81edb4146c
Exists in
master
and in
13 other branches
Merge tag 'remoteproc-3.15-cleanups' of git://git.kernel.org/pub/scm/linux/kerne…
…l/git/ohad/remoteproc Pull remoteproc cleanups from Ohad Ben-Cohen: "Several remoteproc cleanup patches coming from Jingoo Han, Julia Lawall and Uwe Kleine-König" * tag 'remoteproc-3.15-cleanups' of git://git.kernel.org/pub/scm/linux/kernel/git/ohad/remoteproc: remoteproc/ste_modem: staticize local symbols remoteproc/davinci: simplify use of devm_ioremap_resource remoteproc/davinci: drop needless devm_clk_put
Showing 2 changed files Side-by-side Diff
drivers/remoteproc/da8xx_remoteproc.c
| ... | ... | @@ -201,23 +201,11 @@ |
| 201 | 201 | } |
| 202 | 202 | |
| 203 | 203 | bootreg_res = platform_get_resource(pdev, IORESOURCE_MEM, 0); |
| 204 | - if (!bootreg_res) { | |
| 205 | - dev_err(dev, | |
| 206 | - "platform_get_resource(IORESOURCE_MEM, 0): NULL\n"); | |
| 207 | - return -EADDRNOTAVAIL; | |
| 208 | - } | |
| 209 | - | |
| 210 | - chipsig_res = platform_get_resource(pdev, IORESOURCE_MEM, 1); | |
| 211 | - if (!chipsig_res) { | |
| 212 | - dev_err(dev, | |
| 213 | - "platform_get_resource(IORESOURCE_MEM, 1): NULL\n"); | |
| 214 | - return -EADDRNOTAVAIL; | |
| 215 | - } | |
| 216 | - | |
| 217 | 204 | bootreg = devm_ioremap_resource(dev, bootreg_res); |
| 218 | 205 | if (IS_ERR(bootreg)) |
| 219 | 206 | return PTR_ERR(bootreg); |
| 220 | 207 | |
| 208 | + chipsig_res = platform_get_resource(pdev, IORESOURCE_MEM, 1); | |
| 221 | 209 | chipsig = devm_ioremap_resource(dev, chipsig_res); |
| 222 | 210 | if (IS_ERR(chipsig)) |
| 223 | 211 | return PTR_ERR(chipsig); |
| ... | ... | @@ -300,8 +288,6 @@ |
| 300 | 288 | * the device is being removed. This should prevent that. |
| 301 | 289 | */ |
| 302 | 290 | disable_irq(drproc->irq); |
| 303 | - | |
| 304 | - devm_clk_put(dev, drproc->dsp_clk); | |
| 305 | 291 | |
| 306 | 292 | rproc_del(rproc); |
| 307 | 293 | rproc_put(rproc); |
drivers/remoteproc/ste_modem_rproc.c
| ... | ... | @@ -164,7 +164,7 @@ |
| 164 | 164 | } |
| 165 | 165 | |
| 166 | 166 | /* STE modem firmware handler operations */ |
| 167 | -const struct rproc_fw_ops sproc_fw_ops = { | |
| 167 | +static const struct rproc_fw_ops sproc_fw_ops = { | |
| 168 | 168 | .load = sproc_load_segments, |
| 169 | 169 | .find_rsc_table = sproc_find_rsc_table, |
| 170 | 170 | .find_loaded_rsc_table = sproc_find_loaded_rsc_table, |
| ... | ... | @@ -193,7 +193,7 @@ |
| 193 | 193 | sproc_dbg(sproc, "no message was found in vqid %d\n", vqid); |
| 194 | 194 | } |
| 195 | 195 | |
| 196 | -struct ste_modem_dev_cb sproc_dev_cb = { | |
| 196 | +static struct ste_modem_dev_cb sproc_dev_cb = { | |
| 197 | 197 | .kick = sproc_kick_callback, |
| 198 | 198 | }; |
| 199 | 199 |