diff mbox

media: fix hdpvr build warning

Message ID 20130321154509.46ad14e3@redhat.com (mailing list archive)
State New, archived
Headers show

Commit Message

Mauro Carvalho Chehab March 21, 2013, 6:45 p.m. UTC 
Em Tue, 12 Mar 2013 11:40:29 -0700
Randy Dunlap <rdunlap@infradead.org> escreveu:

> From: Randy Dunlap <rdunlap@infradead.org>
> 
> Fix build warning in hdpvr:
> 
> drivers/media/usb/hdpvr/hdpvr-video.c: warning: "CONFIG_I2C_MODULE" is not defined [-Wundef]
> 
> Signed-off-by: Randy Dunlap <rdunlap@infradead.org>
> Reported-by: Geert Uytterhoeven <geert@linux-m68k.org>
> Cc: Janne Grunau <j@jannau.net>

From time to time, people used to write those checks wrong. So,
we're now using a macro to avoid those problems (IS_ENABLED). The better
is to also use it here.

-

[PATCH] Use the proper check for I2C support

As reported by Geert Uytterhoeven <geert@linux-m68k.org>:

	drivers/media/usb/hdpvr/hdpvr-video.c: warning: "CONFIG_I2C_MODULE" is not defined [-Wundef]

Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>


Cheers,
Mauro
--
To unsubscribe from this list: send the line "unsubscribe linux-media" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Comments

Randy Dunlap March 21, 2013, 6:57 p.m. UTC | #1 
On 03/21/13 11:45, Mauro Carvalho Chehab wrote:
> Em Tue, 12 Mar 2013 11:40:29 -0700
> Randy Dunlap <rdunlap@infradead.org> escreveu:
> 
>> From: Randy Dunlap <rdunlap@infradead.org>
>>
>> Fix build warning in hdpvr:
>>
>> drivers/media/usb/hdpvr/hdpvr-video.c: warning: "CONFIG_I2C_MODULE" is not defined [-Wundef]
>>
>> Signed-off-by: Randy Dunlap <rdunlap@infradead.org>
>> Reported-by: Geert Uytterhoeven <geert@linux-m68k.org>
>> Cc: Janne Grunau <j@jannau.net>
> 
> From time to time, people used to write those checks wrong. So,
> we're now using a macro to avoid those problems (IS_ENABLED). The better
> is to also use it here.
> 

From time to time, people omit including header files that should be
included.  Please add

#include <linux/kconfig.h>

to this patch.

Thank you.


> -
> 
> [PATCH] Use the proper check for I2C support
> 
> As reported by Geert Uytterhoeven <geert@linux-m68k.org>:
> 
> 	drivers/media/usb/hdpvr/hdpvr-video.c: warning: "CONFIG_I2C_MODULE" is not defined [-Wundef]
> 
> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
> 
> diff --git a/drivers/media/usb/hdpvr/hdpvr-video.c b/drivers/media/usb/hdpvr/hdpvr-video.c
> index da6b779..554d2eb 100644
> --- a/drivers/media/usb/hdpvr/hdpvr-video.c
> +++ b/drivers/media/usb/hdpvr/hdpvr-video.c
> @@ -1238,7 +1238,7 @@ static void hdpvr_device_release(struct video_device *vdev)
>  	v4l2_device_unregister(&dev->v4l2_dev);
>  
>  	/* deregister I2C adapter */
> -#if defined(CONFIG_I2C) || (CONFIG_I2C_MODULE)
> +#if IS_ENABLED(CONFIG_I2C)
>  	mutex_lock(&dev->i2c_mutex);
>  	i2c_del_adapter(&dev->i2c_adapter);
>  	mutex_unlock(&dev->i2c_mutex);
> 
> Cheers,
> Mauro
>
Mauro Carvalho Chehab March 21, 2013, 9:08 p.m. UTC | #2 
Em Thu, 21 Mar 2013 11:57:24 -0700
Randy Dunlap <rdunlap@infradead.org> escreveu:

> On 03/21/13 11:45, Mauro Carvalho Chehab wrote:
> > Em Tue, 12 Mar 2013 11:40:29 -0700
> > Randy Dunlap <rdunlap@infradead.org> escreveu:
> > 
> >> From: Randy Dunlap <rdunlap@infradead.org>
> >>
> >> Fix build warning in hdpvr:
> >>
> >> drivers/media/usb/hdpvr/hdpvr-video.c: warning: "CONFIG_I2C_MODULE" is not defined [-Wundef]
> >>
> >> Signed-off-by: Randy Dunlap <rdunlap@infradead.org>
> >> Reported-by: Geert Uytterhoeven <geert@linux-m68k.org>
> >> Cc: Janne Grunau <j@jannau.net>
> > 
> > From time to time, people used to write those checks wrong. So,
> > we're now using a macro to avoid those problems (IS_ENABLED). The better
> > is to also use it here.
> > 
> 
> From time to time, people omit including header files that should be
> included.

Heh ;)

> Please add
> 
> #include <linux/kconfig.h>
> 
> to this patch.


Ok, I'll do it.
> 
> Thank you.
> 
> 
> > -
> > 
> > [PATCH] Use the proper check for I2C support
> > 
> > As reported by Geert Uytterhoeven <geert@linux-m68k.org>:
> > 
> > 	drivers/media/usb/hdpvr/hdpvr-video.c: warning: "CONFIG_I2C_MODULE" is not defined [-Wundef]
> > 
> > Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
> > 
> > diff --git a/drivers/media/usb/hdpvr/hdpvr-video.c b/drivers/media/usb/hdpvr/hdpvr-video.c
> > index da6b779..554d2eb 100644
> > --- a/drivers/media/usb/hdpvr/hdpvr-video.c
> > +++ b/drivers/media/usb/hdpvr/hdpvr-video.c
> > @@ -1238,7 +1238,7 @@ static void hdpvr_device_release(struct video_device *vdev)
> >  	v4l2_device_unregister(&dev->v4l2_dev);
> >  
> >  	/* deregister I2C adapter */
> > -#if defined(CONFIG_I2C) || (CONFIG_I2C_MODULE)
> > +#if IS_ENABLED(CONFIG_I2C)
> >  	mutex_lock(&dev->i2c_mutex);
> >  	i2c_del_adapter(&dev->i2c_adapter);
> >  	mutex_unlock(&dev->i2c_mutex);
> > 
> > Cheers,
> > Mauro
> > 
> 
>
diff mbox

Patch

diff --git a/drivers/media/usb/hdpvr/hdpvr-video.c b/drivers/media/usb/hdpvr/hdpvr-video.c
index da6b779..554d2eb 100644
--- a/drivers/media/usb/hdpvr/hdpvr-video.c
+++ b/drivers/media/usb/hdpvr/hdpvr-video.c
@@ -1238,7 +1238,7 @@  static void hdpvr_device_release(struct video_device *vdev)
 	v4l2_device_unregister(&dev->v4l2_dev);
 
 	/* deregister I2C adapter */
-#if defined(CONFIG_I2C) || (CONFIG_I2C_MODULE)
+#if IS_ENABLED(CONFIG_I2C)
 	mutex_lock(&dev->i2c_mutex);
 	i2c_del_adapter(&dev->i2c_adapter);
 	mutex_unlock(&dev->i2c_mutex);