| Message ID | 20220105182939.106885-3-paul@crapouillou.net (mailing list archive) |
|---|---|
| State | Handled Elsewhere |
| Headers | show |
| Series | DEV_PM_OPS macros rework v2 | expand |
On Wed, 5 Jan 2022 at 19:29, Paul Cercueil <paul@crapouillou.net> wrote: > > Keep this macro in line with the other ones. This makes it possible to > use them in the cases where the underlying dev_pm_ops structure is > exported. > > Restore the "static" qualifier in the two drivers where the > DEFINE_SIMPLE_DEV_PM_OPS macro was used. > > Signed-off-by: Paul Cercueil <paul@crapouillou.net> > Acked-by: Jonathan Cameron <Jonathan.Cameron@huawei.com> Reviewed-by: Ulf Hansson <ulf.hansson@linaro.org> Kind regards Uffe > --- > > Notes: > v2: Merge the driver changes to make the commit atomic > > drivers/mmc/host/jz4740_mmc.c | 4 ++-- > drivers/mmc/host/mxcmmc.c | 2 +- > include/linux/pm.h | 2 +- > 3 files changed, 4 insertions(+), 4 deletions(-) > > diff --git a/drivers/mmc/host/jz4740_mmc.c b/drivers/mmc/host/jz4740_mmc.c > index 7693236c946f..7ab1b38a7be5 100644 > --- a/drivers/mmc/host/jz4740_mmc.c > +++ b/drivers/mmc/host/jz4740_mmc.c > @@ -1128,8 +1128,8 @@ static int jz4740_mmc_resume(struct device *dev) > return pinctrl_select_default_state(dev); > } > > -DEFINE_SIMPLE_DEV_PM_OPS(jz4740_mmc_pm_ops, jz4740_mmc_suspend, > - jz4740_mmc_resume); > +static DEFINE_SIMPLE_DEV_PM_OPS(jz4740_mmc_pm_ops, jz4740_mmc_suspend, > + jz4740_mmc_resume); > > static struct platform_driver jz4740_mmc_driver = { > .probe = jz4740_mmc_probe, > diff --git a/drivers/mmc/host/mxcmmc.c b/drivers/mmc/host/mxcmmc.c > index 98c218bd6669..40b6878bea6c 100644 > --- a/drivers/mmc/host/mxcmmc.c > +++ b/drivers/mmc/host/mxcmmc.c > @@ -1210,7 +1210,7 @@ static int mxcmci_resume(struct device *dev) > return ret; > } > > -DEFINE_SIMPLE_DEV_PM_OPS(mxcmci_pm_ops, mxcmci_suspend, mxcmci_resume); > +static DEFINE_SIMPLE_DEV_PM_OPS(mxcmci_pm_ops, mxcmci_suspend, mxcmci_resume); > > static struct platform_driver mxcmci_driver = { > .probe = mxcmci_probe, > diff --git a/include/linux/pm.h b/include/linux/pm.h > index 31bbaafb06d2..389e600df233 100644 > --- a/include/linux/pm.h > +++ b/include/linux/pm.h > @@ -362,7 +362,7 @@ struct dev_pm_ops { > * to RAM and hibernation. > */ > #define DEFINE_SIMPLE_DEV_PM_OPS(name, suspend_fn, resume_fn) \ > -static const struct dev_pm_ops name = { \ > +const struct dev_pm_ops name = { \ > SYSTEM_SLEEP_PM_OPS(suspend_fn, resume_fn) \ > } > > -- > 2.34.1 >
diff --git a/drivers/mmc/host/jz4740_mmc.c b/drivers/mmc/host/jz4740_mmc.c index 7693236c946f..7ab1b38a7be5 100644 --- a/drivers/mmc/host/jz4740_mmc.c +++ b/drivers/mmc/host/jz4740_mmc.c @@ -1128,8 +1128,8 @@ static int jz4740_mmc_resume(struct device *dev) return pinctrl_select_default_state(dev); } -DEFINE_SIMPLE_DEV_PM_OPS(jz4740_mmc_pm_ops, jz4740_mmc_suspend, - jz4740_mmc_resume); +static DEFINE_SIMPLE_DEV_PM_OPS(jz4740_mmc_pm_ops, jz4740_mmc_suspend, + jz4740_mmc_resume); static struct platform_driver jz4740_mmc_driver = { .probe = jz4740_mmc_probe, diff --git a/drivers/mmc/host/mxcmmc.c b/drivers/mmc/host/mxcmmc.c index 98c218bd6669..40b6878bea6c 100644 --- a/drivers/mmc/host/mxcmmc.c +++ b/drivers/mmc/host/mxcmmc.c @@ -1210,7 +1210,7 @@ static int mxcmci_resume(struct device *dev) return ret; } -DEFINE_SIMPLE_DEV_PM_OPS(mxcmci_pm_ops, mxcmci_suspend, mxcmci_resume); +static DEFINE_SIMPLE_DEV_PM_OPS(mxcmci_pm_ops, mxcmci_suspend, mxcmci_resume); static struct platform_driver mxcmci_driver = { .probe = mxcmci_probe, diff --git a/include/linux/pm.h b/include/linux/pm.h index 31bbaafb06d2..389e600df233 100644 --- a/include/linux/pm.h +++ b/include/linux/pm.h @@ -362,7 +362,7 @@ struct dev_pm_ops { * to RAM and hibernation. */ #define DEFINE_SIMPLE_DEV_PM_OPS(name, suspend_fn, resume_fn) \ -static const struct dev_pm_ops name = { \ +const struct dev_pm_ops name = { \ SYSTEM_SLEEP_PM_OPS(suspend_fn, resume_fn) \ }