Merge tag 'modules-for-v5.11' of git://git.kernel.org/pub/scm/linux/kernel/git/jeyu...

[linux-2.6-microblaze.git] / drivers / memory / renesas-rpc-if.c

diff --git a/drivers/memory/renesas-rpc-if.c b/drivers/memory/renesas-rpc-if.c
index f2a33a1..8d36e22 100644 (file)
--- a/drivers/memory/renesas-rpc-if.c
+++ b/drivers/memory/renesas-rpc-if.c
@@ -12,7 +12,6 @@
 #include <linux/module.h>
 #include <linux/platform_device.h>
 #include <linux/of.h>
-#include <linux/pm_runtime.h>
 #include <linux/regmap.h>
 #include <linux/reset.h>
 
@@ -204,18 +203,6 @@ int rpcif_sw_init(struct rpcif *rpc, struct device *dev)
 }
 EXPORT_SYMBOL(rpcif_sw_init);
 
-void rpcif_enable_rpm(struct rpcif *rpc)
-{
-       pm_runtime_enable(rpc->dev);
-}
-EXPORT_SYMBOL(rpcif_enable_rpm);
-
-void rpcif_disable_rpm(struct rpcif *rpc)
-{
-       pm_runtime_put_sync(rpc->dev);
-}
-EXPORT_SYMBOL(rpcif_disable_rpm);
-
 void rpcif_hw_init(struct rpcif *rpc, bool hyperflash)
 {
        u32 dummy;
@@ -508,7 +495,8 @@ exit:
        return ret;
 
 err_out:
-       ret = reset_control_reset(rpc->rstc);
+       if (reset_control_reset(rpc->rstc))
+               dev_err(rpc->dev, "Failed to reset HW\n");
        rpcif_hw_init(rpc, rpc->bus_size == 2);
        goto exit;
 }
@@ -560,9 +548,11 @@ static int rpcif_probe(struct platform_device *pdev)
        } else if (of_device_is_compatible(flash, "cfi-flash")) {
                name = "rpc-if-hyperflash";
        } else  {
+               of_node_put(flash);
                dev_warn(&pdev->dev, "unknown flash type\n");
                return -ENODEV;
        }
+       of_node_put(flash);
 
        vdev = platform_device_alloc(name, pdev->id);
        if (!vdev)