diff options
| -rw-r--r-- | drivers/remoteproc/da8xx_remoteproc.c | 16 | ||||
| -rw-r--r-- | drivers/remoteproc/ste_modem_rproc.c | 4 |
2 files changed, 3 insertions, 17 deletions
diff --git a/drivers/remoteproc/da8xx_remoteproc.c b/drivers/remoteproc/da8xx_remoteproc.c index 129f7b997866..3841b9813109 100644 --- a/drivers/remoteproc/da8xx_remoteproc.c +++ b/drivers/remoteproc/da8xx_remoteproc.c | |||
| @@ -201,23 +201,11 @@ static int da8xx_rproc_probe(struct platform_device *pdev) | |||
| 201 | } | 201 | } |
| 202 | 202 | ||
| 203 | bootreg_res = platform_get_resource(pdev, IORESOURCE_MEM, 0); | 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 | bootreg = devm_ioremap_resource(dev, bootreg_res); | 204 | bootreg = devm_ioremap_resource(dev, bootreg_res); |
| 218 | if (IS_ERR(bootreg)) | 205 | if (IS_ERR(bootreg)) |
| 219 | return PTR_ERR(bootreg); | 206 | return PTR_ERR(bootreg); |
| 220 | 207 | ||
| 208 | chipsig_res = platform_get_resource(pdev, IORESOURCE_MEM, 1); | ||
| 221 | chipsig = devm_ioremap_resource(dev, chipsig_res); | 209 | chipsig = devm_ioremap_resource(dev, chipsig_res); |
| 222 | if (IS_ERR(chipsig)) | 210 | if (IS_ERR(chipsig)) |
| 223 | return PTR_ERR(chipsig); | 211 | return PTR_ERR(chipsig); |
| @@ -301,8 +289,6 @@ static int da8xx_rproc_remove(struct platform_device *pdev) | |||
| 301 | */ | 289 | */ |
| 302 | disable_irq(drproc->irq); | 290 | disable_irq(drproc->irq); |
| 303 | 291 | ||
| 304 | devm_clk_put(dev, drproc->dsp_clk); | ||
| 305 | |||
| 306 | rproc_del(rproc); | 292 | rproc_del(rproc); |
| 307 | rproc_put(rproc); | 293 | rproc_put(rproc); |
| 308 | 294 | ||
diff --git a/drivers/remoteproc/ste_modem_rproc.c b/drivers/remoteproc/ste_modem_rproc.c index 1ec39a4c0b3e..c4ac9104dd8e 100644 --- a/drivers/remoteproc/ste_modem_rproc.c +++ b/drivers/remoteproc/ste_modem_rproc.c | |||
| @@ -164,7 +164,7 @@ sproc_find_loaded_rsc_table(struct rproc *rproc, const struct firmware *fw) | |||
| 164 | } | 164 | } |
| 165 | 165 | ||
| 166 | /* STE modem firmware handler operations */ | 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 | .load = sproc_load_segments, | 168 | .load = sproc_load_segments, |
| 169 | .find_rsc_table = sproc_find_rsc_table, | 169 | .find_rsc_table = sproc_find_rsc_table, |
| 170 | .find_loaded_rsc_table = sproc_find_loaded_rsc_table, | 170 | .find_loaded_rsc_table = sproc_find_loaded_rsc_table, |
| @@ -193,7 +193,7 @@ static void sproc_kick_callback(struct ste_modem_device *mdev, int vqid) | |||
| 193 | sproc_dbg(sproc, "no message was found in vqid %d\n", vqid); | 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 | .kick = sproc_kick_callback, | 197 | .kick = sproc_kick_callback, |
| 198 | }; | 198 | }; |
| 199 | 199 | ||
