Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f210c53a authored by Ulf Hansson's avatar Ulf Hansson Committed by Russell King
Browse files

ARM: 7958/1: amba: Let runtime PM callbacks be available for CONFIG_PM 



Convert to the SET_PM_RUNTIME_PM macro while defining the runtime PM
callbacks. This means the callbacks becomes available for both
CONFIG_PM_SLEEP and CONFIG_PM_RUNTIME, which is needed by drivers and
power domains.

Signed-off-by: default avatarUlf Hansson <ulf.hansson@linaro.org>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent b28a960c

drivers/amba/bus.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -83,7 +83,7 @@ static struct device_attribute amba_dev_attrs[] = { 
	__ATTR_NULL,

	__ATTR_NULL,

};

};





#ifdef CONFIG_PM_RUNTIME

#ifdef CONFIG_PM

/*

/*

 * Hooks to provide runtime PM of the pclk (bus clock).  It is safe to

 * Hooks to provide runtime PM of the pclk (bus clock).  It is safe to

 * enable/disable the bus clock at runtime PM suspend/resume as this

 * enable/disable the bus clock at runtime PM suspend/resume as this
@@ -123,7 +123,7 @@ static const struct dev_pm_ops amba_pm = { 
	.thaw		= pm_generic_thaw,

	.thaw		= pm_generic_thaw,

	.poweroff	= pm_generic_poweroff,

	.poweroff	= pm_generic_poweroff,

	.restore	= pm_generic_restore,

	.restore	= pm_generic_restore,

	SET_RUNTIME_PM_OPS(

	SET_PM_RUNTIME_PM_OPS(

		amba_pm_runtime_suspend,

		amba_pm_runtime_suspend,

		amba_pm_runtime_resume,

		amba_pm_runtime_resume,

		NULL

		NULL