Commit 3ee40825 authored by Claudiu Beznea's avatar Claudiu Beznea Committed by Ulf Hansson
Browse files

amba: bus: Drop dev_pm_domain_detach() call 



Starting with commit f9950807 ("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: default avatarClaudiu Beznea <claudiu.beznea.uj@bp.renesas.com>
Signed-off-by: default avatarUlf Hansson <ulf.hansson@linaro.org>
parent d4aa5960

drivers/amba/bus.c

+3 −6
Original line number Diff line number Diff line
@@ -291,15 +291,14 @@ static int amba_probe(struct device *dev) 
		if (ret < 0)

			break;



		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)

			break;



		ret = amba_get_enable_pclk(pcdev);

		if (ret) {

			dev_pm_domain_detach(dev, true);

		if (ret)

			break;

		}



		pm_runtime_get_noresume(dev);

		pm_runtime_set_active(dev);
@@ -314,7 +313,6 @@ static int amba_probe(struct device *dev) 
		pm_runtime_put_noidle(dev);



		amba_put_disable_pclk(pcdev);

		dev_pm_domain_detach(dev, true);

	} while (0);



	return ret;
@@ -336,7 +334,6 @@ static void amba_remove(struct device *dev) 
	pm_runtime_put_noidle(dev);



	amba_put_disable_pclk(pcdev);

	dev_pm_domain_detach(dev, true);

}



static void amba_shutdown(struct device *dev)