Merge tag 'remoteproc-3.15-cleanups' of git://git.kernel.org/pub/scm/linux/kernel...
[linux.git] / drivers / remoteproc / da8xx_remoteproc.c
index 129f7b9978663b159e16c30e30e3ec590656a3f0..3841b98131093716d12f13e1584892c1395894ce 100644 (file)
@@ -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);