xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

mfd: atmel-flexcom: Remove #ifdef CONFIG_PM_SLEEP

Browse Source 
[ Upstream commit 8c0fad75dcaa650e3f3145a2c35847bc6a65cb7f ]

Remove compilation flag and use __maybe_unused and pm_ptr instead.

Signed-off-by: Claudiu Beznea <claudiu.beznea@microchip.com>
Acked-by: Nicolas Ferre <nicolas.ferre@microchip.com>
Signed-off-by: Lee Jones <lee.jones@linaro.org>
Link: https://lore.kernel.org/r/20211028135138.3481166-2-claudiu.beznea@microchip.com
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Claudiu Beznea
2021-10-28 16:51:37 +03:00
committed by Greg Kroah-Hartman
parent f93c9aa1d3
commit 46d6a23114
1 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/mfd/atmel-flexcom.c
View File

@@ -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)
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 = {
.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,
}, },
}; };