| Message ID | 1391529538-21685-7-git-send-email-ulf.hansson@linaro.org |
|---|---|
| State | Accepted |
| Commit | 736198b0486c8d5032456de0813515d954df978a |
| Headers | show |
On 4 February 2014 16:58, Ulf Hansson <ulf.hansson@linaro.org> 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 to handle the > combinations of these scenarios. > > Cc: Mark Brown <broonie@kernel.org> > Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org> Mark, any thoughts of this one? This will be needed no matter of patch 7. Also note that, Russell has already applied the corresponding part in the amba bus (patch 1) Kind regards Uffe > --- > drivers/spi/spi-pl022.c | 6 +++--- > 1 file changed, 3 insertions(+), 3 deletions(-) > > diff --git a/drivers/spi/spi-pl022.c b/drivers/spi/spi-pl022.c > index 2789b45..70fa907 100644 > --- a/drivers/spi/spi-pl022.c > +++ b/drivers/spi/spi-pl022.c > @@ -2288,7 +2288,7 @@ pl022_remove(struct amba_device *adev) > return 0; > } > > -#if defined(CONFIG_SUSPEND) || defined(CONFIG_PM_RUNTIME) > +#ifdef CONFIG_PM > /* > * These two functions are used from both suspend/resume and > * the runtime counterparts to handle external resources like > @@ -2354,7 +2354,7 @@ static int pl022_resume(struct device *dev) > } > #endif /* CONFIG_PM */ > > -#ifdef CONFIG_PM_RUNTIME > +#ifdef CONFIG_PM > static int pl022_runtime_suspend(struct device *dev) > { > struct pl022 *pl022 = dev_get_drvdata(dev); > @@ -2374,7 +2374,7 @@ static int pl022_runtime_resume(struct device *dev) > > static const struct dev_pm_ops pl022_dev_pm_ops = { > SET_SYSTEM_SLEEP_PM_OPS(pl022_suspend, pl022_resume) > - SET_RUNTIME_PM_OPS(pl022_runtime_suspend, pl022_runtime_resume, NULL) > + SET_PM_RUNTIME_PM_OPS(pl022_runtime_suspend, pl022_runtime_resume, NULL) > }; > > static struct vendor_data vendor_arm = { > -- > 1.7.9.5 > -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
On 19 February 2014 16:10, Mark Brown <broonie@kernel.org> wrote: > On Wed, Feb 19, 2014 at 03:20:07PM +0100, Ulf Hansson wrote: > >> Also note that, Russell has already applied the corresponding part in >> the amba bus (patch 1) > > Why would this depend on an AMBA patch and if it does surely the two > need to be merged together somehow? There are no immediate dependency, sorry for confusion. I just wanted to highlight that the amba has converted to the new SET_PM_RUNTIME_PM_OPS. It means the amba bus' runtime PM callbacks are available for CONFIG_PM. Kind regards Uffe -- 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/spi/spi-pl022.c b/drivers/spi/spi-pl022.c index 2789b45..70fa907 100644 --- a/drivers/spi/spi-pl022.c +++ b/drivers/spi/spi-pl022.c @@ -2288,7 +2288,7 @@ pl022_remove(struct amba_device *adev) return 0; } -#if defined(CONFIG_SUSPEND) || defined(CONFIG_PM_RUNTIME) +#ifdef CONFIG_PM /* * These two functions are used from both suspend/resume and * the runtime counterparts to handle external resources like @@ -2354,7 +2354,7 @@ static int pl022_resume(struct device *dev) } #endif /* CONFIG_PM */ -#ifdef CONFIG_PM_RUNTIME +#ifdef CONFIG_PM static int pl022_runtime_suspend(struct device *dev) { struct pl022 *pl022 = dev_get_drvdata(dev); @@ -2374,7 +2374,7 @@ static int pl022_runtime_resume(struct device *dev) static const struct dev_pm_ops pl022_dev_pm_ops = { SET_SYSTEM_SLEEP_PM_OPS(pl022_suspend, pl022_resume) - SET_RUNTIME_PM_OPS(pl022_runtime_suspend, pl022_runtime_resume, NULL) + SET_PM_RUNTIME_PM_OPS(pl022_runtime_suspend, pl022_runtime_resume, NULL) }; static struct vendor_data vendor_arm = {
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 to handle the combinations of these scenarios. Cc: Mark Brown <broonie@kernel.org> Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org> --- drivers/spi/spi-pl022.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)