| Message ID | 20230628132652.87202-1-martin@kaiser.cx |
|---|---|
| State | New |
| Headers | show |
| Series | fbdev: imxfb: switch to DEFINE_SIMPLE_DEV_PM_OPS | expand |
On 6/28/23 15:26, Martin Kaiser wrote: > 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> both patches applied. Thanks! Helge > --- > drivers/video/fbdev/imxfb.c | 8 ++++---- > 1 file changed, 4 insertions(+), 4 deletions(-) > > diff --git a/drivers/video/fbdev/imxfb.c b/drivers/video/fbdev/imxfb.c > index 5fbcb78a9cae..04f3bf30a529 100644 > --- a/drivers/video/fbdev/imxfb.c > +++ b/drivers/video/fbdev/imxfb.c > @@ -1066,7 +1066,7 @@ static void imxfb_remove(struct platform_device *pdev) > framebuffer_release(info); > } > > -static int __maybe_unused imxfb_suspend(struct device *dev) > +static int imxfb_suspend(struct device *dev) > { > struct fb_info *info = dev_get_drvdata(dev); > struct imxfb_info *fbi = info->par; > @@ -1076,7 +1076,7 @@ static int __maybe_unused imxfb_suspend(struct device *dev) > return 0; > } > > -static int __maybe_unused imxfb_resume(struct device *dev) > +static int imxfb_resume(struct device *dev) > { > struct fb_info *info = dev_get_drvdata(dev); > struct imxfb_info *fbi = info->par; > @@ -1086,13 +1086,13 @@ static int __maybe_unused imxfb_resume(struct device *dev) > return 0; > } > > -static SIMPLE_DEV_PM_OPS(imxfb_pm_ops, imxfb_suspend, imxfb_resume); > +static DEFINE_SIMPLE_DEV_PM_OPS(imxfb_pm_ops, imxfb_suspend, imxfb_resume); > > static struct platform_driver imxfb_driver = { > .driver = { > .name = DRIVER_NAME, > .of_match_table = imxfb_of_dev_id, > - .pm = &imxfb_pm_ops, > + .pm = pm_sleep_ptr(&imxfb_pm_ops), > }, > .probe = imxfb_probe, > .remove_new = imxfb_remove,
diff --git a/drivers/video/fbdev/imxfb.c b/drivers/video/fbdev/imxfb.c index 5fbcb78a9cae..04f3bf30a529 100644 --- a/drivers/video/fbdev/imxfb.c +++ b/drivers/video/fbdev/imxfb.c @@ -1066,7 +1066,7 @@ static void imxfb_remove(struct platform_device *pdev) framebuffer_release(info); } -static int __maybe_unused imxfb_suspend(struct device *dev) +static int imxfb_suspend(struct device *dev) { struct fb_info *info = dev_get_drvdata(dev); struct imxfb_info *fbi = info->par; @@ -1076,7 +1076,7 @@ static int __maybe_unused imxfb_suspend(struct device *dev) return 0; } -static int __maybe_unused imxfb_resume(struct device *dev) +static int imxfb_resume(struct device *dev) { struct fb_info *info = dev_get_drvdata(dev); struct imxfb_info *fbi = info->par; @@ -1086,13 +1086,13 @@ static int __maybe_unused imxfb_resume(struct device *dev) return 0; } -static SIMPLE_DEV_PM_OPS(imxfb_pm_ops, imxfb_suspend, imxfb_resume); +static DEFINE_SIMPLE_DEV_PM_OPS(imxfb_pm_ops, imxfb_suspend, imxfb_resume); static struct platform_driver imxfb_driver = { .driver = { .name = DRIVER_NAME, .of_match_table = imxfb_of_dev_id, - .pm = &imxfb_pm_ops, + .pm = pm_sleep_ptr(&imxfb_pm_ops), }, .probe = imxfb_probe, .remove_new = imxfb_remove,
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> --- drivers/video/fbdev/imxfb.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)