[PATCH v1 2/2] drm/rockchip: fix warning from cdn_dp_resume

Enric Balletbo i Serra enric.balletbo at collabora.com
Mon Sep 28 10:42:58 EDT 2020


Hi Sam,

Thank you for your patch.

On 25/9/20 23:55, Sam Ravnborg wrote:
> Commit 7c49abb4c2f8 ("drm/rockchip: cdn-dp-core: Make cdn_dp_core_suspend/resume static")
> introduced the following warning in some builds:
> 
> cdn-dp-core.c:1124:12: warning: ‘cdn_dp_resume’ defined but not used
>  1124 | static int cdn_dp_resume(struct device *dev)
>       |            ^~~~~~~~~~~~~
> 
> Fix this by defining cdn_dp_resume __maybe_unused
> 
> Signed-off-by: Sam Ravnborg <sam at ravnborg.org>
> Fixes: 7c49abb4c2f8 ("drm/rockchip: cdn-dp-core: Make cdn_dp_core_suspend/resume static")
> Cc: Enric Balletbo i Serra <enric.balletbo at collabora.com>
> Cc: Heiko Stuebner <heiko at sntech.de>
> Cc: Sandy Huang <hjc at rock-chips.com>
> Cc: linux-arm-kernel at lists.infradead.org
> Cc: linux-rockchip at lists.infradead.org
> Cc: <stable at vger.kernel.org> # v5.8+
> ---

Hopefully this time this change lands ;-) Similar patches [1], [2], [3], were
sent in the past by different authors but for some reason never reached upstream.

[1] https://lkml.org/lkml/2020/4/28/1703
[2] https://www.spinics.net/lists/dri-devel/msg268818.html
[3] https://lkml.org/lkml/2020/8/10/1412

>  drivers/gpu/drm/rockchip/cdn-dp-core.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/drivers/gpu/drm/rockchip/cdn-dp-core.c b/drivers/gpu/drm/rockchip/cdn-dp-core.c
> index a4a45daf93f2..1162e321aaed 100644
> --- a/drivers/gpu/drm/rockchip/cdn-dp-core.c
> +++ b/drivers/gpu/drm/rockchip/cdn-dp-core.c
> @@ -1121,7 +1121,7 @@ static int cdn_dp_suspend(struct device *dev)

Shouldn't cdn_dp_suspend also have a __maybe_unused?

With that,

Reviewed-by: Enric Balletbo i Serra <enric.balletbo at collabora.com>

>  	return ret;
>  }
>  
> -static int cdn_dp_resume(struct device *dev)
> +static int __maybe_unused cdn_dp_resume(struct device *dev)
>  {
>  	struct cdn_dp_device *dp = dev_get_drvdata(dev);
>  
> 



More information about the Linux-rockchip mailing list