| Message ID | 1391529538-21685-2-git-send-email-ulf.hansson@linaro.org |
|---|---|
| State | Accepted |
| Commit | f210c53a82ab9ba10574f8121a300d78e618febd |
| Headers | show |
On 19 February 2014 10:40, Russell King - ARM Linux <linux@arm.linux.org.uk> wrote: > On Tue, Feb 04, 2014 at 04:58:42PM +0100, Ulf Hansson wrote: >> 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. > > This patch is wrong, because it causes build errors: > > drivers/amba/bus.c:126:18: error: 'pm_generic_suspend_late' undeclared here (not in a function) > drivers/amba/bus.c:127:18: error: 'pm_generic_resume_early' undeclared here (not in a function) > drivers/amba/bus.c:128:17: error: 'pm_generic_freeze_late' undeclared here (not in a function) > drivers/amba/bus.c:129:16: error: 'pm_generic_thaw_early' undeclared here (not in a function) > drivers/amba/bus.c:130:19: error: 'pm_generic_poweroff_late' undeclared here (not in a function) > drivers/amba/bus.c:131:19: error: 'pm_generic_restore_early' undeclared here (not in a function) > > The failing configuration is: > > # CONFIG_SUSPEND is not set > CONFIG_PM_RUNTIME=y > CONFIG_PM=y > Thanks for spotting this! I thought I had tested all the various combinations, but obvisouly not. Anyway to add some more clarify; it is not this patch that causes the issue. It's patch 2, which introduces the late/early callbacks. Though the problem need to be fixed in the PM core, pm_generic_suspend_late etc is not set to NULL for !CONFIG_PM_SLEEP, they should. I guess we should put patch 2 on hold until, right? Kind regards Ulf Hansson > -- > FTTC broadband for 0.8mile line: 5.8Mbps down 500kbps up. Estimation > in database were 13.1 to 19Mbit for a good line, about 7.5+ for a bad. > Estimate before purchase was "up to 13.2Mbit". -- To unsubscribe from this list: send the line "unsubscribe linux-spi" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/amba/bus.c b/drivers/amba/bus.c index 9e60291..3cf61a1 100644 --- a/drivers/amba/bus.c +++ b/drivers/amba/bus.c @@ -83,7 +83,7 @@ static struct device_attribute amba_dev_attrs[] = { __ATTR_NULL, }; -#ifdef CONFIG_PM_RUNTIME +#ifdef CONFIG_PM /* * 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 @@ -123,7 +123,7 @@ static const struct dev_pm_ops amba_pm = { .thaw = pm_generic_thaw, .poweroff = pm_generic_poweroff, .restore = pm_generic_restore, - SET_RUNTIME_PM_OPS( + SET_PM_RUNTIME_PM_OPS( amba_pm_runtime_suspend, amba_pm_runtime_resume, NULL
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. Cc: Russell King <linux@arm.linux.org.uk> Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org> --- drivers/amba/bus.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)