From: Claudiu Beznea <claudiu.beznea...@bp.renesas.com>

Starting with commit f99508074e78 ("PM: domains: Detach on
device_unbind_cleanup()"), there is no longer a need to call
dev_pm_domain_detach() in the bus remove function. The
device_unbind_cleanup() function now handles this to avoid
invoking devres cleanup handlers while the PM domain is
powered off, which could otherwise lead to failures as
described in the above-mentioned commit.

Drop the explicit dev_pm_domain_detach() call and rely instead
on the flags passed to dev_pm_domain_attach() to power off the
domain.

Signed-off-by: Claudiu Beznea <claudiu.beznea...@bp.renesas.com>
---
 drivers/rpmsg/rpmsg_core.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/drivers/rpmsg/rpmsg_core.c b/drivers/rpmsg/rpmsg_core.c
index bece5e635ee9..5d661681a9b6 100644
--- a/drivers/rpmsg/rpmsg_core.c
+++ b/drivers/rpmsg/rpmsg_core.c
@@ -479,7 +479,8 @@ static int rpmsg_dev_probe(struct device *dev)
        struct rpmsg_endpoint *ept = NULL;
        int err;
 
-       err = dev_pm_domain_attach(dev, PD_FLAG_ATTACH_POWER_ON);
+       err = dev_pm_domain_attach(dev, PD_FLAG_ATTACH_POWER_ON |
+                                       PD_FLAG_DETACH_POWER_OFF);
        if (err)
                goto out;
 
@@ -538,8 +539,6 @@ static void rpmsg_dev_remove(struct device *dev)
        if (rpdrv->remove)
                rpdrv->remove(rpdev);
 
-       dev_pm_domain_detach(dev, true);
-
        if (rpdev->ept)
                rpmsg_destroy_ept(rpdev->ept);
 }
-- 
2.43.0


Reply via email to