]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
spi: Drop dev_pm_domain_detach() call
authorClaudiu Beznea <claudiu.beznea.uj@bp.renesas.com>
Wed, 27 Aug 2025 10:16:12 +0000 (13:16 +0300)
committerMark Brown <broonie@kernel.org>
Thu, 28 Aug 2025 09:08:52 +0000 (11:08 +0200)
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.uj@bp.renesas.com>
Reviewed-by: Ulf Hansson <ulf.hansson@linaro.org>
Message-ID: <20250827101612.928008-1-claudiu.beznea.uj@bp.renesas.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
drivers/spi/spi.c

index a388f372b27a7f29d18f1dd5e862902811016fc6..f95c4304df8e91200dc84ad4c7a99f2308bfdab7 100644 (file)
@@ -427,15 +427,13 @@ static int spi_probe(struct device *dev)
        if (spi->irq < 0)
                spi->irq = 0;
 
-       ret = dev_pm_domain_attach(dev, PD_FLAG_ATTACH_POWER_ON);
+       ret = dev_pm_domain_attach(dev, PD_FLAG_ATTACH_POWER_ON |
+                                       PD_FLAG_DETACH_POWER_OFF);
        if (ret)
                return ret;
 
-       if (sdrv->probe) {
+       if (sdrv->probe)
                ret = sdrv->probe(spi);
-               if (ret)
-                       dev_pm_domain_detach(dev, true);
-       }
 
        return ret;
 }
@@ -446,8 +444,6 @@ static void spi_remove(struct device *dev)
 
        if (sdrv->remove)
                sdrv->remove(to_spi_device(dev));
-
-       dev_pm_domain_detach(dev, true);
 }
 
 static void spi_shutdown(struct device *dev)