video: fbdev: pvr2fb: fix compile-testing as module

Submitted by Arnd Bergmann on June 17, 2019, 12:47 p.m.

Details

Message ID 20190617124758.1252449-1-arnd@arndb.de
State New
Headers show
Series "video: fbdev: pvr2fb: fix compile-testing as module" ( rev: 1 ) in DRI devel

Not browsing as part of any series.

Commit Message

Arnd Bergmann June 17, 2019, 12:47 p.m.
Building an allmodconfig kernel now produces a harmless warning:

drivers/video/fbdev/pvr2fb.c:726:12: error: unused function 'pvr2_get_param_val' [-Werror,-Wunused-function]

Shut this up the same way as we do for other unused functions
in the same file, using the __maybe_unused attribute.

Fixes: 0f5a5712ad1e ("video: fbdev: pvr2fb: add COMPILE_TEST support")
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---
 drivers/video/fbdev/pvr2fb.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Patch hide | download patch | download mbox

diff --git a/drivers/video/fbdev/pvr2fb.c b/drivers/video/fbdev/pvr2fb.c
index 59c59b3a67cb..cf9cfdc5e685 100644
--- a/drivers/video/fbdev/pvr2fb.c
+++ b/drivers/video/fbdev/pvr2fb.c
@@ -723,8 +723,8 @@  static struct fb_ops pvr2fb_ops = {
 	.fb_imageblit	= cfb_imageblit,
 };
 
-static int pvr2_get_param_val(const struct pvr2_params *p, const char *s,
-			      int size)
+static int __maybe_unused pvr2_get_param_val(const struct pvr2_params *p,
+					     const char *s, int size)
 {
 	int i;
 

Comments

On 6/17/19 2:47 PM, Arnd Bergmann wrote:
> Building an allmodconfig kernel now produces a harmless warning:
> 
> drivers/video/fbdev/pvr2fb.c:726:12: error: unused function 'pvr2_get_param_val' [-Werror,-Wunused-function]
> 
> Shut this up the same way as we do for other unused functions
> in the same file, using the __maybe_unused attribute.
> 
> Fixes: 0f5a5712ad1e ("video: fbdev: pvr2fb: add COMPILE_TEST support")
> Signed-off-by: Arnd Bergmann <arnd@arndb.de>

Thanks but I've fixed it already by adding #ifndef MODULE (since other
functions in the same file using __maybe_unused depend on either PCI or
SH_DREAMCAST I've preferred not to use this attribute):

https://marc.info/?l=linux-fbdev&m=156050904010778&w=2

> ---
>  drivers/video/fbdev/pvr2fb.c | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/video/fbdev/pvr2fb.c b/drivers/video/fbdev/pvr2fb.c
> index 59c59b3a67cb..cf9cfdc5e685 100644
> --- a/drivers/video/fbdev/pvr2fb.c
> +++ b/drivers/video/fbdev/pvr2fb.c
> @@ -723,8 +723,8 @@ static struct fb_ops pvr2fb_ops = {
>  	.fb_imageblit	= cfb_imageblit,
>  };
>  
> -static int pvr2_get_param_val(const struct pvr2_params *p, const char *s,
> -			      int size)
> +static int __maybe_unused pvr2_get_param_val(const struct pvr2_params *p,
> +					     const char *s, int size)
>  {
>  	int i;

Best regards,
--
Bartlomiej Zolnierkiewicz
Samsung R&D Institute Poland
Samsung Electronics
On Fri, Jun 21, 2019 at 1:15 PM Bartlomiej Zolnierkiewicz
<b.zolnierkie@samsung.com> wrote:
>
>
> On 6/17/19 2:47 PM, Arnd Bergmann wrote:
> > Building an allmodconfig kernel now produces a harmless warning:
> >
> > drivers/video/fbdev/pvr2fb.c:726:12: error: unused function 'pvr2_get_param_val' [-Werror,-Wunused-function]
> >
> > Shut this up the same way as we do for other unused functions
> > in the same file, using the __maybe_unused attribute.
> >
> > Fixes: 0f5a5712ad1e ("video: fbdev: pvr2fb: add COMPILE_TEST support")
> > Signed-off-by: Arnd Bergmann <arnd@arndb.de>
>
> Thanks but I've fixed it already by adding #ifndef MODULE (since other
> functions in the same file using __maybe_unused depend on either PCI or
> SH_DREAMCAST I've preferred not to use this attribute):
>
> https://marc.info/?l=linux-fbdev&m=156050904010778&w=2

Ok, dropping my patch from the local queue, your version is obviously
correct as well.

      Arnd