Merge tag 'remoteproc-3.15-cleanups' of git://git.kernel.org/pub/scm/linux/kernel...

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

diff --git a/drivers/remoteproc/da8xx_remoteproc.c b/drivers/remoteproc/da8xx_remoteproc.c
index 129f7b9978663b159e16c30e30e3ec590656a3f0..3841b98131093716d12f13e1584892c1395894ce 100644 (file)
--- 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)
        }
 
        bootreg_res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-       if (!bootreg_res) {
-               dev_err(dev,
-                       "platform_get_resource(IORESOURCE_MEM, 0): NULL\n");
-               return -EADDRNOTAVAIL;
-       }
-
-       chipsig_res = platform_get_resource(pdev, IORESOURCE_MEM, 1);
-       if (!chipsig_res) {
-               dev_err(dev,
-                       "platform_get_resource(IORESOURCE_MEM, 1): NULL\n");
-               return -EADDRNOTAVAIL;
-       }
-
        bootreg = devm_ioremap_resource(dev, bootreg_res);
        if (IS_ERR(bootreg))
                return PTR_ERR(bootreg);
 
+       chipsig_res = platform_get_resource(pdev, IORESOURCE_MEM, 1);
        chipsig = devm_ioremap_resource(dev, chipsig_res);
        if (IS_ERR(chipsig))
                return PTR_ERR(chipsig);
@@ -301,8 +289,6 @@ static int da8xx_rproc_remove(struct platform_device *pdev)
         */
        disable_irq(drproc->irq);
 
-       devm_clk_put(dev, drproc->dsp_clk);
-
        rproc_del(rproc);
        rproc_put(rproc);
 

diff --git a/drivers/remoteproc/ste_modem_rproc.c b/drivers/remoteproc/ste_modem_rproc.c
index 1ec39a4c0b3edbd9a6c64ef95e22649ab6ca7de7..c4ac9104dd8e4ec1c866e1247926cce7e4f9d24a 100644 (file)
--- 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)
 }
 
 /* STE modem firmware handler operations */
-const struct rproc_fw_ops sproc_fw_ops = {
+static const struct rproc_fw_ops sproc_fw_ops = {
        .load = sproc_load_segments,
        .find_rsc_table = sproc_find_rsc_table,
        .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)
                sproc_dbg(sproc, "no message was found in vqid %d\n", vqid);
 }
 
-struct ste_modem_dev_cb sproc_dev_cb = {
+static struct ste_modem_dev_cb sproc_dev_cb = {
        .kick = sproc_kick_callback,
 };