| Message ID | 20210906194917.376116-1-palmer@dabbelt.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [RESEND] drm/rockchip: cdn-dp-core: Fix cdn_dp_resume unused warning | expand |
On Mon, Sep 6, 2021 at 9:58 PM Palmer Dabbelt <palmer@dabbelt.com> wrote: > From: Palmer Dabbelt <palmerdabbelt@google.com> > > cdn_dp_resume is only used under PM_SLEEP, and now that it's static an > unused function warning is triggered undner !PM_SLEEP. This > conditionally enables the function to avoid the warning. > > Fixes: 7c49abb4c2f8 ("drm/rockchip: cdn-dp-core: Make cdn_dp_core_suspend/resume static") > Signed-off-by: Palmer Dabbelt <palmerdabbelt@google.com> Reviewed-by: Geert Uytterhoeven <geert+renesas@glider.be> > --- > I sent this one out in January, but it looks like it got lost in the shuffle. > I'm getting this on a RISC-V allmodconfig now. > --- > drivers/gpu/drm/rockchip/cdn-dp-core.c | 2 ++ > 1 file changed, 2 insertions(+) > > diff --git a/drivers/gpu/drm/rockchip/cdn-dp-core.c b/drivers/gpu/drm/rockchip/cdn-dp-core.c > index 8ab3247dbc4a..bee0f2d2a9be 100644 > --- a/drivers/gpu/drm/rockchip/cdn-dp-core.c > +++ b/drivers/gpu/drm/rockchip/cdn-dp-core.c > @@ -1123,6 +1123,7 @@ static int cdn_dp_suspend(struct device *dev) > return ret; > } > > +#ifdef CONFIG_PM_SLEEP > static int cdn_dp_resume(struct device *dev) An alternative solution would be to tag the function with __maybe_unused. > { > struct cdn_dp_device *dp = dev_get_drvdata(dev); > @@ -1135,6 +1136,7 @@ static int cdn_dp_resume(struct device *dev) > > return 0; > } > +#endif > > static int cdn_dp_probe(struct platform_device *pdev) > { Gr{oetje,eeting}s, Geert
On Tue, Sep 7, 2021 at 9:02 AM Geert Uytterhoeven <geert@linux-m68k.org> wrote: > On Mon, Sep 6, 2021 at 9:58 PM Palmer Dabbelt <palmer@dabbelt.com> wrote: > > From: Palmer Dabbelt <palmerdabbelt@google.com> > > > > +#ifdef CONFIG_PM_SLEEP > > static int cdn_dp_resume(struct device *dev) > > An alternative solution would be to tag the function with > __maybe_unused. Right. In this case, both are correct, but generally speaking I tend to use the __maybe_unused variant because it's more reliable at fixing the warning for good when there are additional functions called by the suspend/resume helpers that now become unused in some configurations, or when you pick the wrong set of #ifdefs. Having fewer #ifdef checks also helps with build coverage testing when there is a warning inside of an #ifdef. Arnd
diff --git a/drivers/gpu/drm/rockchip/cdn-dp-core.c b/drivers/gpu/drm/rockchip/cdn-dp-core.c index 8ab3247dbc4a..bee0f2d2a9be 100644 --- a/drivers/gpu/drm/rockchip/cdn-dp-core.c +++ b/drivers/gpu/drm/rockchip/cdn-dp-core.c @@ -1123,6 +1123,7 @@ static int cdn_dp_suspend(struct device *dev) return ret; } +#ifdef CONFIG_PM_SLEEP static int cdn_dp_resume(struct device *dev) { struct cdn_dp_device *dp = dev_get_drvdata(dev); @@ -1135,6 +1136,7 @@ static int cdn_dp_resume(struct device *dev) return 0; } +#endif static int cdn_dp_probe(struct platform_device *pdev) {