Skip to content

Commit 52cc1d7

Browse files
pcercueirafaeljw
authored andcommitted
PM: core: Remove static qualifier in DEFINE_SIMPLE_DEV_PM_OPS macro
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 <[email protected]> Acked-by: Jonathan Cameron <[email protected]> Reviewed-by: Ulf Hansson <[email protected]> Signed-off-by: Rafael J. Wysocki <[email protected]>
1 parent 3f4b325 commit 52cc1d7

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

drivers/mmc/host/jz4740_mmc.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1113,8 +1113,8 @@ static int jz4740_mmc_resume(struct device *dev)
11131113
return pinctrl_select_default_state(dev);
11141114
}
11151115

1116-
DEFINE_SIMPLE_DEV_PM_OPS(jz4740_mmc_pm_ops, jz4740_mmc_suspend,
1117-
jz4740_mmc_resume);
1116+
static DEFINE_SIMPLE_DEV_PM_OPS(jz4740_mmc_pm_ops, jz4740_mmc_suspend,
1117+
jz4740_mmc_resume);
11181118

11191119
static struct platform_driver jz4740_mmc_driver = {
11201120
.probe = jz4740_mmc_probe,

drivers/mmc/host/mxcmmc.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1210,7 +1210,7 @@ static int mxcmci_resume(struct device *dev)
12101210
return ret;
12111211
}
12121212

1213-
DEFINE_SIMPLE_DEV_PM_OPS(mxcmci_pm_ops, mxcmci_suspend, mxcmci_resume);
1213+
static DEFINE_SIMPLE_DEV_PM_OPS(mxcmci_pm_ops, mxcmci_suspend, mxcmci_resume);
12141214

12151215
static struct platform_driver mxcmci_driver = {
12161216
.probe = mxcmci_probe,

include/linux/pm.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -362,7 +362,7 @@ struct dev_pm_ops {
362362
* to RAM and hibernation.
363363
*/
364364
#define DEFINE_SIMPLE_DEV_PM_OPS(name, suspend_fn, resume_fn) \
365-
static const struct dev_pm_ops name = { \
365+
const struct dev_pm_ops name = { \
366366
SYSTEM_SLEEP_PM_OPS(suspend_fn, resume_fn) \
367367
}
368368

0 commit comments

Comments
 (0)