i2c: mv64xxx: Add atomic_xfer method to driver

[platform/kernel/linux-rpi.git] / drivers / memory / mtk-smi.c

diff --git a/drivers/memory/mtk-smi.c b/drivers/memory/mtk-smi.c
index b396253..c5fb51f 100644 (file)
--- a/drivers/memory/mtk-smi.c
+++ b/drivers/memory/mtk-smi.c
@@ -319,6 +319,7 @@ static int mtk_smi_larb_probe(struct platform_device *pdev)
        struct device *dev = &pdev->dev;
        struct device_node *smi_node;
        struct platform_device *smi_pdev;
+       struct device_link *link;
 
        larb = devm_kzalloc(dev, sizeof(*larb), GFP_KERNEL);
        if (!larb)
@@ -358,6 +359,12 @@ static int mtk_smi_larb_probe(struct platform_device *pdev)
                if (!platform_get_drvdata(smi_pdev))
                        return -EPROBE_DEFER;
                larb->smi_common_dev = &smi_pdev->dev;
+               link = device_link_add(dev, larb->smi_common_dev,
+                                      DL_FLAG_PM_RUNTIME | DL_FLAG_STATELESS);
+               if (!link) {
+                       dev_err(dev, "Unable to link smi-common dev\n");
+                       return -ENODEV;
+               }
        } else {
                dev_err(dev, "Failed to get the smi_common device\n");
                return -EINVAL;
@@ -370,6 +377,9 @@ static int mtk_smi_larb_probe(struct platform_device *pdev)
 
 static int mtk_smi_larb_remove(struct platform_device *pdev)
 {
+       struct mtk_smi_larb *larb = platform_get_drvdata(pdev);
+
+       device_link_remove(&pdev->dev, larb->smi_common_dev);
        pm_runtime_disable(&pdev->dev);
        component_del(&pdev->dev, &mtk_smi_larb_component_ops);
        return 0;
@@ -381,17 +391,9 @@ static int __maybe_unused mtk_smi_larb_resume(struct device *dev)
        const struct mtk_smi_larb_gen *larb_gen = larb->larb_gen;
        int ret;
 
-       /* Power on smi-common. */
-       ret = pm_runtime_resume_and_get(larb->smi_common_dev);
-       if (ret < 0) {
-               dev_err(dev, "Failed to pm get for smi-common(%d).\n", ret);
-               return ret;
-       }
-
        ret = mtk_smi_clk_enable(&larb->smi);
        if (ret < 0) {
                dev_err(dev, "Failed to enable clock(%d).\n", ret);
-               pm_runtime_put_sync(larb->smi_common_dev);
                return ret;
        }
 
@@ -406,7 +408,6 @@ static int __maybe_unused mtk_smi_larb_suspend(struct device *dev)
        struct mtk_smi_larb *larb = dev_get_drvdata(dev);
 
        mtk_smi_clk_disable(&larb->smi);
-       pm_runtime_put_sync(larb->smi_common_dev);
        return 0;
 }