tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

fbdev: imxfb: switch to DEFINE_SIMPLE_DEV_PM_OPS

SIMPLE_DEV_PM_OPS is deprecated, replace it with DEFINE_SIMPLE_DEV_PM_OPS
and use pm_sleep_ptr for setting the driver's pm routines. We can now
remove the __maybe_unused qualifier in the suspend and resume functions.

Signed-off-by: Martin Kaiser <martin@kaiser.cx>
Signed-off-by: Helge Deller <deller@gmx.de>

authored by

Martin Kaiser and committed by
Helge Deller 86a10102 4e47382f

+4 -4
+4 -4
drivers/video/fbdev/imxfb.c
··· 1066 1066 framebuffer_release(info); 1067 1067 } 1068 1068 1069 - static int __maybe_unused imxfb_suspend(struct device *dev) 1069 + static int imxfb_suspend(struct device *dev) 1070 1070 { 1071 1071 struct fb_info *info = dev_get_drvdata(dev); 1072 1072 struct imxfb_info *fbi = info->par; ··· 1076 1076 return 0; 1077 1077 } 1078 1078 1079 - static int __maybe_unused imxfb_resume(struct device *dev) 1079 + static int imxfb_resume(struct device *dev) 1080 1080 { 1081 1081 struct fb_info *info = dev_get_drvdata(dev); 1082 1082 struct imxfb_info *fbi = info->par; ··· 1086 1086 return 0; 1087 1087 } 1088 1088 1089 - static SIMPLE_DEV_PM_OPS(imxfb_pm_ops, imxfb_suspend, imxfb_resume); 1089 + static DEFINE_SIMPLE_DEV_PM_OPS(imxfb_pm_ops, imxfb_suspend, imxfb_resume); 1090 1090 1091 1091 static struct platform_driver imxfb_driver = { 1092 1092 .driver = { 1093 1093 .name = DRIVER_NAME, 1094 1094 .of_match_table = imxfb_of_dev_id, 1095 - .pm = &imxfb_pm_ops, 1095 + .pm = pm_sleep_ptr(&imxfb_pm_ops), 1096 1096 }, 1097 1097 .probe = imxfb_probe, 1098 1098 .remove_new = imxfb_remove,