| Message ID | 20150206060953.GA34087@dtor-ws (mailing list archive) |
|---|---|
| State | Accepted |
| Headers | show |
Hi Dmitry, On Fri, Feb 6, 2015 at 2:09 PM, Dmitry Torokhov <dmitry.torokhov@gmail.com> wrote: > Instead of using #ifdef to guard potentially unused suspend and resume code > let's mark them as __maybe_unused so they still get discarded if they are > not used but we do not get warning. This allows for better compile coverage. > > Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com> > --- > drivers/input/misc/bfin_rotary.c | 14 ++++---------- > 1 file changed, 4 insertions(+), 10 deletions(-) > > diff --git a/drivers/input/misc/bfin_rotary.c b/drivers/input/misc/bfin_rotary.c > index a39793c..09d7612 100644 > --- a/drivers/input/misc/bfin_rotary.c > +++ b/drivers/input/misc/bfin_rotary.c > @@ -232,8 +232,7 @@ static int bfin_rotary_remove(struct platform_device *pdev) > return 0; > } > > -#ifdef CONFIG_PM > -static int bfin_rotary_suspend(struct device *dev) > +static int __maybe_unused bfin_rotary_suspend(struct device *dev) > { > struct platform_device *pdev = to_platform_device(dev); > struct bfin_rot *rotary = platform_get_drvdata(pdev); > @@ -248,7 +247,7 @@ static int bfin_rotary_suspend(struct device *dev) > return 0; > } > > -static int bfin_rotary_resume(struct device *dev) > +static int __maybe_unused bfin_rotary_resume(struct device *dev) > { > struct platform_device *pdev = to_platform_device(dev); > struct bfin_rot *rotary = platform_get_drvdata(pdev); > @@ -266,20 +265,15 @@ static int bfin_rotary_resume(struct device *dev) > return 0; > } > > -static const struct dev_pm_ops bfin_rotary_pm_ops = { > - .suspend = bfin_rotary_suspend, > - .resume = bfin_rotary_resume, > -}; > -#endif > +static SIMPLE_DEV_PM_OPS(bfin_rotary_pm_ops, > + bfin_rotary_suspend, bfin_rotary_resume); > > static struct platform_driver bfin_rotary_device_driver = { > .probe = bfin_rotary_probe, > .remove = bfin_rotary_remove, > .driver = { > .name = "bfin-rotary", You missed .owner = THIS_MODULE, here. > -#ifdef CONFIG_PM > .pm = &bfin_rotary_pm_ops, > -#endif > }, > }; > module_platform_driver(bfin_rotary_device_driver); > -- > 2.2.0.rc0.207.ga3a616c > > Regards, Sonic -- To unsubscribe from this list: send the line "unsubscribe linux-input" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Fri, Feb 6, 2015 at 10:06 AM, Sonic Zhang <sonic.adi@gmail.com> wrote: >> static struct platform_driver bfin_rotary_device_driver = { >> .probe = bfin_rotary_probe, >> .remove = bfin_rotary_remove, >> .driver = { >> .name = "bfin-rotary", > > You missed > .owner = THIS_MODULE, > here. That line was removed in v3.19-rc1 by commit 776bd315a7721574 ("input: misc: drop owner assignment from platform_drivers"). Gr{oetje,eeting}s, Geert -- Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org In personal conversations with technical people, I call myself a hacker. But when I'm talking to journalists I just say "programmer" or something like that. -- Linus Torvalds -- To unsubscribe from this list: send the line "unsubscribe linux-input" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Hi Dmitry, Since the line I mentioned was removed in v3.19-rc1, I am fine with this patch. Acked-by: Sonic Zhang <sonic.zhang@analog.com> On Fri, Feb 6, 2015 at 2:09 PM, Dmitry Torokhov <dmitry.torokhov@gmail.com> wrote: > Instead of using #ifdef to guard potentially unused suspend and resume code > let's mark them as __maybe_unused so they still get discarded if they are > not used but we do not get warning. This allows for better compile coverage. > > Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com> > --- > drivers/input/misc/bfin_rotary.c | 14 ++++---------- > 1 file changed, 4 insertions(+), 10 deletions(-) > > diff --git a/drivers/input/misc/bfin_rotary.c b/drivers/input/misc/bfin_rotary.c > index a39793c..09d7612 100644 > --- a/drivers/input/misc/bfin_rotary.c > +++ b/drivers/input/misc/bfin_rotary.c > @@ -232,8 +232,7 @@ static int bfin_rotary_remove(struct platform_device *pdev) > return 0; > } > > -#ifdef CONFIG_PM > -static int bfin_rotary_suspend(struct device *dev) > +static int __maybe_unused bfin_rotary_suspend(struct device *dev) > { > struct platform_device *pdev = to_platform_device(dev); > struct bfin_rot *rotary = platform_get_drvdata(pdev); > @@ -248,7 +247,7 @@ static int bfin_rotary_suspend(struct device *dev) > return 0; > } > > -static int bfin_rotary_resume(struct device *dev) > +static int __maybe_unused bfin_rotary_resume(struct device *dev) > { > struct platform_device *pdev = to_platform_device(dev); > struct bfin_rot *rotary = platform_get_drvdata(pdev); > @@ -266,20 +265,15 @@ static int bfin_rotary_resume(struct device *dev) > return 0; > } > > -static const struct dev_pm_ops bfin_rotary_pm_ops = { > - .suspend = bfin_rotary_suspend, > - .resume = bfin_rotary_resume, > -}; > -#endif > +static SIMPLE_DEV_PM_OPS(bfin_rotary_pm_ops, > + bfin_rotary_suspend, bfin_rotary_resume); > > static struct platform_driver bfin_rotary_device_driver = { > .probe = bfin_rotary_probe, > .remove = bfin_rotary_remove, > .driver = { > .name = "bfin-rotary", > -#ifdef CONFIG_PM > .pm = &bfin_rotary_pm_ops, > -#endif > }, > }; > module_platform_driver(bfin_rotary_device_driver); > -- > 2.2.0.rc0.207.ga3a616c > > > -- > Dmitry > -- > To unsubscribe from this list: send the line "unsubscribe linux-input" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html -- To unsubscribe from this list: send the line "unsubscribe linux-input" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/input/misc/bfin_rotary.c b/drivers/input/misc/bfin_rotary.c index a39793c..09d7612 100644 --- a/drivers/input/misc/bfin_rotary.c +++ b/drivers/input/misc/bfin_rotary.c @@ -232,8 +232,7 @@ static int bfin_rotary_remove(struct platform_device *pdev) return 0; } -#ifdef CONFIG_PM -static int bfin_rotary_suspend(struct device *dev) +static int __maybe_unused bfin_rotary_suspend(struct device *dev) { struct platform_device *pdev = to_platform_device(dev); struct bfin_rot *rotary = platform_get_drvdata(pdev); @@ -248,7 +247,7 @@ static int bfin_rotary_suspend(struct device *dev) return 0; } -static int bfin_rotary_resume(struct device *dev) +static int __maybe_unused bfin_rotary_resume(struct device *dev) { struct platform_device *pdev = to_platform_device(dev); struct bfin_rot *rotary = platform_get_drvdata(pdev); @@ -266,20 +265,15 @@ static int bfin_rotary_resume(struct device *dev) return 0; } -static const struct dev_pm_ops bfin_rotary_pm_ops = { - .suspend = bfin_rotary_suspend, - .resume = bfin_rotary_resume, -}; -#endif +static SIMPLE_DEV_PM_OPS(bfin_rotary_pm_ops, + bfin_rotary_suspend, bfin_rotary_resume); static struct platform_driver bfin_rotary_device_driver = { .probe = bfin_rotary_probe, .remove = bfin_rotary_remove, .driver = { .name = "bfin-rotary", -#ifdef CONFIG_PM .pm = &bfin_rotary_pm_ops, -#endif }, }; module_platform_driver(bfin_rotary_device_driver);
Instead of using #ifdef to guard potentially unused suspend and resume code let's mark them as __maybe_unused so they still get discarded if they are not used but we do not get warning. This allows for better compile coverage. Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com> --- drivers/input/misc/bfin_rotary.c | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-)