提交 871edf62 编写于 作者: C Claudiu Beznea 提交者: Zheng Zengkai

mfd: atmel-flexcom: Remove #ifdef CONFIG_PM_SLEEP

stable inclusion
from stable-v5.10.94
commit 46d6a2311409d03c0679b125d9b8aadc3f54e763
bugzilla: https://gitee.com/openeuler/kernel/issues/I531X9

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=46d6a2311409d03c0679b125d9b8aadc3f54e763

--------------------------------

[ Upstream commit 8c0fad75 ]

Remove compilation flag and use __maybe_unused and pm_ptr instead.
Signed-off-by: NClaudiu Beznea <claudiu.beznea@microchip.com>
Acked-by: NNicolas Ferre <nicolas.ferre@microchip.com>
Signed-off-by: NLee Jones <lee.jones@linaro.org>
Link: https://lore.kernel.org/r/20211028135138.3481166-2-claudiu.beznea@microchip.comSigned-off-by: NSasha Levin <sashal@kernel.org>
Signed-off-by: NZheng Zengkai <zhengzengkai@huawei.com>
Acked-by: NXie XiuQi <xiexiuqi@huawei.com>
上级 dd474ded
...@@ -87,8 +87,7 @@ static const struct of_device_id atmel_flexcom_of_match[] = { ...@@ -87,8 +87,7 @@ static const struct of_device_id atmel_flexcom_of_match[] = {
}; };
MODULE_DEVICE_TABLE(of, atmel_flexcom_of_match); MODULE_DEVICE_TABLE(of, atmel_flexcom_of_match);
#ifdef CONFIG_PM_SLEEP static int __maybe_unused atmel_flexcom_resume(struct device *dev)
static int atmel_flexcom_resume(struct device *dev)
{ {
struct atmel_flexcom *ddata = dev_get_drvdata(dev); struct atmel_flexcom *ddata = dev_get_drvdata(dev);
int err; int err;
...@@ -105,7 +104,6 @@ static int atmel_flexcom_resume(struct device *dev) ...@@ -105,7 +104,6 @@ static int atmel_flexcom_resume(struct device *dev)
return 0; return 0;
} }
#endif
static SIMPLE_DEV_PM_OPS(atmel_flexcom_pm_ops, NULL, static SIMPLE_DEV_PM_OPS(atmel_flexcom_pm_ops, NULL,
atmel_flexcom_resume); atmel_flexcom_resume);
...@@ -114,7 +112,7 @@ static struct platform_driver atmel_flexcom_driver = { ...@@ -114,7 +112,7 @@ static struct platform_driver atmel_flexcom_driver = {
.probe = atmel_flexcom_probe, .probe = atmel_flexcom_probe,
.driver = { .driver = {
.name = "atmel_flexcom", .name = "atmel_flexcom",
.pm = &atmel_flexcom_pm_ops, .pm = pm_ptr(&atmel_flexcom_pm_ops),
.of_match_table = atmel_flexcom_of_match, .of_match_table = atmel_flexcom_of_match,
}, },
}; };
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册