[v2] drm/rockchip: cdn-dp-core: Fix cdn_dp_resume unused warning

Commit Message

Palmer Dabbelt Sept. 11, 2021, 3:43 a.m. UTC

From: Palmer Dabbelt <[e-mail]>

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 marks the
function as possibly unused, to avoid triggering compiler warnings.

Fixes: 7c49abb4c2f8 ("drm/rockchip: cdn-dp-core: Make cdn_dp_core_suspend/resume static")
Reviewed-by: Geert Uytterhoeven <[e-mail]>
Signed-off-by: Palmer Dabbelt <[e-mail]>
---
This is breaking my builds and looks like it'll land after -rc1, so I've put it
on a shared tag for-rockchip-cdn_dp_resume-v2 which will let me pull it in to
my fixes.  LMK if you guys want me to send this up on my own, but I'm assuming
that the drm/rockchip folks will handle it.
---
 drivers/gpu/drm/rockchip/cdn-dp-core.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Heiko Stübner Sept. 21, 2021, 9:12 a.m. UTC | #1

On Fri, 10 Sep 2021 20:43:18 -0700, Palmer Dabbelt wrote:
> 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 marks the
> function as possibly unused, to avoid triggering compiler warnings.

Applied, thanks!

[1/1] drm/rockchip: cdn-dp-core: Fix cdn_dp_resume unused warning
      commit: f7c57a4566115657c16fd6603b6ef8a21bae5194

Best regards,

Palmer Dabbelt Sept. 21, 2021, 3:04 p.m. UTC | #2

On Tue, 21 Sep 2021 02:12:17 PDT (-0700), [e-mail] wrote:
> On Fri, 10 Sep 2021 20:43:18 -0700, Palmer Dabbelt wrote:
>> 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 marks the
>> function as possibly unused, to avoid triggering compiler warnings.
>
> Applied, thanks!
>
> [1/1] drm/rockchip: cdn-dp-core: Fix cdn_dp_resume unused warning
>       commit: f7c57a4566115657c16fd6603b6ef8a21bae5194

I'm not quite sure where that lives, but is it applied on top of 
something or is it merged from the tag?  Like I said a bit below this in 
the original patch, this has started to break the build for me and I'd 
like to pull it in as soon as possible.

Heiko Stübner Sept. 21, 2021, 7:29 p.m. UTC | #3

Hi,

Am Dienstag, 21. September 2021, 17:04:10 CEST schrieb Palmer Dabbelt:
> On Tue, 21 Sep 2021 02:12:17 PDT (-0700), [e-mail] wrote:
> > On Fri, 10 Sep 2021 20:43:18 -0700, Palmer Dabbelt wrote:
> >> 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 marks the
> >> function as possibly unused, to avoid triggering compiler warnings.
> >
> > Applied, thanks!
> >
> > [1/1] drm/rockchip: cdn-dp-core: Fix cdn_dp_resume unused warning
> >       commit: f7c57a4566115657c16fd6603b6ef8a21bae5194
> 
> I'm not quite sure where that lives, but is it applied on top of 
> something or is it merged from the tag?  Like I said a bit below this in 
> the original patch, this has started to break the build for me and I'd 
> like to pull it in as soon as possible.

The patch now lives here:
https://cgit.freedesktop.org/drm/drm-misc/commit/?h=drm-misc-fixes&id=f7c57a4566115657c16fd6603b6ef8a21bae5194

This is the drm-misc tree, with the patch living in the drm-misc-fixes
branch, which targets the current rc-kernels.

drm-misc-* moves into the core drm tree and from there on to Linus.


Hope that helps
Heiko

Patch

diff --git a/drivers/gpu/drm/rockchip/cdn-dp-core.c b/drivers/gpu/drm/rockchip/cdn-dp-core.c
index 8ab3247dbc4a..13c6b857158f 100644
--- a/drivers/gpu/drm/rockchip/cdn-dp-core.c
+++ b/drivers/gpu/drm/rockchip/cdn-dp-core.c
@@ -1123,7 +1123,7 @@  static int cdn_dp_suspend(struct device *dev)
 	return ret;
 }
 
-static int cdn_dp_resume(struct device *dev)
+static __maybe_unused int cdn_dp_resume(struct device *dev)
 {
 	struct cdn_dp_device *dp = dev_get_drvdata(dev);