Re: [PATCH] [media] hide unused functions for !MEDIA_CONTROLLER

[Mauro Carvalho Chehab <mchehab@osg.samsung.com>]

Em Fri, 4 Mar 2016 17:34:43 -0700
Shuah Khan <shuahkh@osg.samsung.com> escreveu:

> On 03/04/2016 05:06 PM, Arnd Bergmann wrote:
> > Some functions in the au0828 driver are only used when CONFIG_MEDIA_CONTROLLER
> > is enabled, and otherwise defined as empty functions:
> > 
> > media/usb/au0828/au0828-core.c:208:13: error: 'au0828_media_graph_notify' defined but not used [-Werror=unused-function]
> > media/usb/au0828/au0828-core.c:262:12: error: 'au0828_enable_source' defined but not used [-Werror=unused-function]
> > media/usb/au0828/au0828-core.c:412:13: error: 'au0828_disable_source' defined but not used [-Werror=unused-function]
> > 
> > This moves the #ifdef so the entire definitions are hidden in this case.
> > 
> > Signed-off-by: Arnd Bergmann <arnd@arndb.de>  
> 
> Thanks for fixing this.
> 
> Comments below:
> 
> > ---
> >  drivers/media/usb/au0828/au0828-core.c | 8 ++------
> >  1 file changed, 2 insertions(+), 6 deletions(-)
> > 
> > diff --git a/drivers/media/usb/au0828/au0828-core.c b/drivers/media/usb/au0828/au0828-core.c
> > index 4ffaa3b2e905..d312098720a8 100644
> > --- a/drivers/media/usb/au0828/au0828-core.c
> > +++ b/drivers/media/usb/au0828/au0828-core.c
> > @@ -205,10 +205,10 @@ static int au0828_media_device_init(struct au0828_dev *dev,
> >  	return 0;
> >  }
> >  
> > +#ifdef CONFIG_MEDIA_CONTROLLER
> >  static void au0828_media_graph_notify(struct media_entity *new,
> >  				      void *notify_data)
> >  {
> > -#ifdef CONFIG_MEDIA_CONTROLLER
> >  	struct au0828_dev *dev = (struct au0828_dev *) notify_data;
> >  	int ret;
> >  	struct media_entity *entity, *mixer = NULL, *decoder = NULL;
> > @@ -256,13 +256,11 @@ create_link:
> >  			dev_err(&dev->usbdev->dev,
> >  				"Mixer Pad Link Create Error: %d\n", ret);
> >  	}
> > -#endif
> >  }
> >  
> >  static int au0828_enable_source(struct media_entity *entity,
> >  				struct media_pipeline *pipe)
> >  {
> > -#ifdef CONFIG_MEDIA_CONTROLLER
> >  	struct media_entity  *source, *find_source;
> >  	struct media_entity *sink;
> >  	struct media_link *link, *found_link = NULL;
> > @@ -405,13 +403,11 @@ end:
> >  	pr_debug("au0828_enable_source() end %s %d %d\n",
> >  		 entity->name, entity->function, ret);
> >  	return ret;
> > -#endif
> >  	return 0;  
> 
> The above return 0 isn't needed with the change you made.

Applied with the above suggestion of removing return 0.

Regards,
Mauro