* [PATCH V2 01/24] pci/cx88/cx88.h: use IS_ENABLED() macro
2013-01-19 23:41 [PATCH V2 00/24] [media] use IS_ENABLED() macro Peter Senna Tschudin
@ 2013-01-19 23:41 ` Peter Senna Tschudin
2013-01-19 23:41 ` [PATCH V2 02/24] pci/saa7134/saa7134.h: " Peter Senna Tschudin
` (23 subsequent siblings)
24 siblings, 0 replies; 28+ messages in thread
From: Peter Senna Tschudin @ 2013-01-19 23:41 UTC (permalink / raw)
To: mchehab
Cc: hans.verkuil, jrnieder, peter.senna, emilgoode, linux-media,
kernel-janitors
replace:
#if defined(CONFIG_VIDEO_CX88_DVB) || \
defined(CONFIG_VIDEO_CX88_DVB_MODULE)
with:
#if IS_ENABLED(CONFIG_VIDEO_CX88_DVB)
This change was made for: CONFIG_VIDEO_CX88_DVB,
CONFIG_VIDEO_CX88_BLACKBIRD, CONFIG_VIDEO_CX88_VP3054
Reported-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Signed-off-by: Peter Senna Tschudin <peter.senna@gmail.com>
---
Changes from V1:
Updated subject
drivers/media/pci/cx88/cx88.h | 10 ++++------
1 file changed, 4 insertions(+), 6 deletions(-)
diff --git a/drivers/media/pci/cx88/cx88.h b/drivers/media/pci/cx88/cx88.h
index ba0dba4..feff53c 100644
--- a/drivers/media/pci/cx88/cx88.h
+++ b/drivers/media/pci/cx88/cx88.h
@@ -363,7 +363,7 @@ struct cx88_core {
unsigned int tuner_formats;
/* config info -- dvb */
-#if defined(CONFIG_VIDEO_CX88_DVB) || defined(CONFIG_VIDEO_CX88_DVB_MODULE)
+#if IS_ENABLED(CONFIG_VIDEO_CX88_DVB)
int (*prev_set_voltage)(struct dvb_frontend *fe, fe_sec_voltage_t voltage);
#endif
void (*gate_ctrl)(struct cx88_core *core, int open);
@@ -562,8 +562,7 @@ struct cx8802_dev {
/* for blackbird only */
struct list_head devlist;
-#if defined(CONFIG_VIDEO_CX88_BLACKBIRD) || \
- defined(CONFIG_VIDEO_CX88_BLACKBIRD_MODULE)
+#if IS_ENABLED(CONFIG_VIDEO_CX88_BLACKBIRD)
struct video_device *mpeg_dev;
u32 mailbox;
int width;
@@ -574,13 +573,12 @@ struct cx8802_dev {
struct cx2341x_handler cxhdl;
#endif
-#if defined(CONFIG_VIDEO_CX88_DVB) || defined(CONFIG_VIDEO_CX88_DVB_MODULE)
+#if IS_ENABLED(CONFIG_VIDEO_CX88_DVB)
/* for dvb only */
struct videobuf_dvb_frontends frontends;
#endif
-#if defined(CONFIG_VIDEO_CX88_VP3054) || \
- defined(CONFIG_VIDEO_CX88_VP3054_MODULE)
+#if IS_ENABLED(CONFIG_VIDEO_CX88_VP3054)
/* For VP3045 secondary I2C bus support */
struct vp3054_i2c_state *vp3054;
#endif
--
1.7.11.7
^ permalink raw reply related [flat|nested] 28+ messages in thread* [PATCH V2 02/24] pci/saa7134/saa7134.h: use IS_ENABLED() macro
2013-01-19 23:41 [PATCH V2 00/24] [media] use IS_ENABLED() macro Peter Senna Tschudin
2013-01-19 23:41 ` [PATCH V2 01/24] pci/cx88/cx88.h: " Peter Senna Tschudin
@ 2013-01-19 23:41 ` Peter Senna Tschudin
2013-01-19 23:41 ` [PATCH V2 03/24] pci/ttpci/av7110.c: " Peter Senna Tschudin
` (22 subsequent siblings)
24 siblings, 0 replies; 28+ messages in thread
From: Peter Senna Tschudin @ 2013-01-19 23:41 UTC (permalink / raw)
To: mchehab
Cc: remi.schwartz, sean, kyle, simon.farnsworth, linux-media,
kernel-janitors, Peter Senna Tschudin
replace:
#if defined(CONFIG_VIDEO_SAA7134_DVB) || \
defined(CONFIG_VIDEO_SAA7134_DVB_MODULE)
with:
#if IS_ENABLED(CONFIG_VIDEO_SAA7134_DVB)
This change was made for: CONFIG_VIDEO_SAA7134_DVB
Reported-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Signed-off-by: Peter Senna Tschudin <peter.senna@gmail.com>
---
Changes from V1:
Updated subject
drivers/media/pci/saa7134/saa7134.h | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/media/pci/saa7134/saa7134.h b/drivers/media/pci/saa7134/saa7134.h
index 0a3feaa..ace44fd 100644
--- a/drivers/media/pci/saa7134/saa7134.h
+++ b/drivers/media/pci/saa7134/saa7134.h
@@ -42,7 +42,7 @@
#include <media/videobuf-dma-sg.h>
#include <sound/core.h>
#include <sound/pcm.h>
-#if defined(CONFIG_VIDEO_SAA7134_DVB) || defined(CONFIG_VIDEO_SAA7134_DVB_MODULE)
+#if IS_ENABLED(CONFIG_VIDEO_SAA7134_DVB)
#include <media/videobuf-dvb.h>
#endif
@@ -644,7 +644,7 @@ struct saa7134_dev {
struct work_struct empress_workqueue;
int empress_started;
-#if defined(CONFIG_VIDEO_SAA7134_DVB) || defined(CONFIG_VIDEO_SAA7134_DVB_MODULE)
+#if IS_ENABLED(CONFIG_VIDEO_SAA7134_DVB)
/* SAA7134_MPEG_DVB only */
struct videobuf_dvb_frontends frontends;
int (*original_demod_sleep)(struct dvb_frontend *fe);
--
1.7.11.7
^ permalink raw reply related [flat|nested] 28+ messages in thread* [PATCH V2 03/24] pci/ttpci/av7110.c: use IS_ENABLED() macro
2013-01-19 23:41 [PATCH V2 00/24] [media] use IS_ENABLED() macro Peter Senna Tschudin
2013-01-19 23:41 ` [PATCH V2 01/24] pci/cx88/cx88.h: " Peter Senna Tschudin
2013-01-19 23:41 ` [PATCH V2 02/24] pci/saa7134/saa7134.h: " Peter Senna Tschudin
@ 2013-01-19 23:41 ` Peter Senna Tschudin
2013-01-19 23:41 ` [PATCH V2 04/24] platform/marvell-ccic/mcam-core.h: " Peter Senna Tschudin
` (21 subsequent siblings)
24 siblings, 0 replies; 28+ messages in thread
From: Peter Senna Tschudin @ 2013-01-19 23:41 UTC (permalink / raw)
To: mchehab
Cc: schulz, dhowells, peter.senna, mkrufky, linux-media,
kernel-janitors
replace:
#if defined(CONFIG_INPUT_EVDEV) || \
defined(CONFIG_INPUT_EVDEV_MODULE)
with:
#if IS_ENABLED(CONFIG_INPUT_EVDEV)
This change was made for: CONFIG_INPUT_EVDEV,
CONFIG_DVB_SP8870
Reported-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Signed-off-by: Peter Senna Tschudin <peter.senna@gmail.com>
---
Changes from V1:
Updated subject
drivers/media/pci/ttpci/av7110.c | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/drivers/media/pci/ttpci/av7110.c b/drivers/media/pci/ttpci/av7110.c
index 2f54e2b..fc9e7e5 100644
--- a/drivers/media/pci/ttpci/av7110.c
+++ b/drivers/media/pci/ttpci/av7110.c
@@ -235,7 +235,7 @@ static void recover_arm(struct av7110 *av7110)
restart_feeds(av7110);
-#if defined(CONFIG_INPUT_EVDEV) || defined(CONFIG_INPUT_EVDEV_MODULE)
+#if IS_ENABLED(CONFIG_INPUT_EVDEV)
av7110_check_ir_config(av7110, true);
#endif
}
@@ -268,7 +268,7 @@ static int arm_thread(void *data)
if (!av7110->arm_ready)
continue;
-#if defined(CONFIG_INPUT_EVDEV) || defined(CONFIG_INPUT_EVDEV_MODULE)
+#if IS_ENABLED(CONFIG_INPUT_EVDEV)
av7110_check_ir_config(av7110, false);
#endif
@@ -1730,7 +1730,7 @@ static int alps_tdlb7_tuner_set_params(struct dvb_frontend *fe)
static int alps_tdlb7_request_firmware(struct dvb_frontend* fe, const struct firmware **fw, char* name)
{
-#if defined(CONFIG_DVB_SP8870) || defined(CONFIG_DVB_SP8870_MODULE)
+#if IS_ENABLED(CONFIG_DVB_SP8870)
struct av7110* av7110 = fe->dvb->priv;
return request_firmware(fw, name, &av7110->dev->pci->dev);
@@ -2725,7 +2725,7 @@ static int __devinit av7110_attach(struct saa7146_dev* dev,
mutex_init(&av7110->ioctl_mutex);
-#if defined(CONFIG_INPUT_EVDEV) || defined(CONFIG_INPUT_EVDEV_MODULE)
+#if IS_ENABLED(CONFIG_INPUT_EVDEV)
av7110_ir_init(av7110);
#endif
printk(KERN_INFO "dvb-ttpci: found av7110-%d.\n", av7110_num);
@@ -2768,7 +2768,7 @@ static int __devexit av7110_detach(struct saa7146_dev* saa)
struct av7110 *av7110 = saa->ext_priv;
dprintk(4, "%p\n", av7110);
-#if defined(CONFIG_INPUT_EVDEV) || defined(CONFIG_INPUT_EVDEV_MODULE)
+#if IS_ENABLED(CONFIG_INPUT_EVDEV)
av7110_ir_exit(av7110);
#endif
if (budgetpatch || av7110->full_ts) {
--
1.7.11.7
^ permalink raw reply related [flat|nested] 28+ messages in thread* [PATCH V2 04/24] platform/marvell-ccic/mcam-core.h: use IS_ENABLED() macro
2013-01-19 23:41 [PATCH V2 00/24] [media] use IS_ENABLED() macro Peter Senna Tschudin
` (2 preceding siblings ...)
2013-01-19 23:41 ` [PATCH V2 03/24] pci/ttpci/av7110.c: " Peter Senna Tschudin
@ 2013-01-19 23:41 ` Peter Senna Tschudin
2013-01-19 23:41 ` [PATCH V2 05/24] radio/si470x/radio-si470x.h: " Peter Senna Tschudin
` (20 subsequent siblings)
24 siblings, 0 replies; 28+ messages in thread
From: Peter Senna Tschudin @ 2013-01-19 23:41 UTC (permalink / raw)
To: corbet; +Cc: mchehab, linux-media, kernel-janitors, Peter Senna Tschudin
replace:
#if defined(CONFIG_VIDEOBUF2_VMALLOC) || \
defined(CONFIG_VIDEOBUF2_VMALLOC_MODULE)
with:
#if IS_ENABLED(CONFIG_VIDEOBUF2_VMALLOC)
This change was made for: CONFIG_VIDEOBUF2_VMALLOC,
CONFIG_VIDEOBUF2_DMA_CONTIG, CONFIG_VIDEOBUF2_DMA_SG
Reported-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Signed-off-by: Peter Senna Tschudin <peter.senna@gmail.com>
---
Changes from V1:
Updated subject
drivers/media/platform/marvell-ccic/mcam-core.h | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/media/platform/marvell-ccic/mcam-core.h b/drivers/media/platform/marvell-ccic/mcam-core.h
index 5e802c6..6c53ac9 100644
--- a/drivers/media/platform/marvell-ccic/mcam-core.h
+++ b/drivers/media/platform/marvell-ccic/mcam-core.h
@@ -15,15 +15,15 @@
* Create our own symbols for the supported buffer modes, but, for now,
* base them entirely on which videobuf2 options have been selected.
*/
-#if defined(CONFIG_VIDEOBUF2_VMALLOC) || defined(CONFIG_VIDEOBUF2_VMALLOC_MODULE)
+#if IS_ENABLED(CONFIG_VIDEOBUF2_VMALLOC)
#define MCAM_MODE_VMALLOC 1
#endif
-#if defined(CONFIG_VIDEOBUF2_DMA_CONTIG) || defined(CONFIG_VIDEOBUF2_DMA_CONTIG_MODULE)
+#if IS_ENABLED(CONFIG_VIDEOBUF2_DMA_CONTIG)
#define MCAM_MODE_DMA_CONTIG 1
#endif
-#if defined(CONFIG_VIDEOBUF2_DMA_SG) || defined(CONFIG_VIDEOBUF2_DMA_SG_MODULE)
+#if IS_ENABLED(CONFIG_VIDEOBUF2_DMA_SG)
#define MCAM_MODE_DMA_SG 1
#endif
--
1.7.11.7
^ permalink raw reply related [flat|nested] 28+ messages in thread* [PATCH V2 05/24] radio/si470x/radio-si470x.h: use IS_ENABLED() macro
2013-01-19 23:41 [PATCH V2 00/24] [media] use IS_ENABLED() macro Peter Senna Tschudin
` (3 preceding siblings ...)
2013-01-19 23:41 ` [PATCH V2 04/24] platform/marvell-ccic/mcam-core.h: " Peter Senna Tschudin
@ 2013-01-19 23:41 ` Peter Senna Tschudin
2013-01-20 16:03 ` Hans Verkuil
2013-01-19 23:41 ` [PATCH V2 06/24] usb/gspca/cpia1.c: " Peter Senna Tschudin
` (19 subsequent siblings)
24 siblings, 1 reply; 28+ messages in thread
From: Peter Senna Tschudin @ 2013-01-19 23:41 UTC (permalink / raw)
To: hverkuil; +Cc: mchehab, linux-media, kernel-janitors, Peter Senna Tschudin
replace:
#if defined(CONFIG_USB_SI470X) || \
defined(CONFIG_USB_SI470X_MODULE)
with:
#if IS_ENABLED(CONFIG_USB_SI470X)
This change was made for: CONFIG_USB_SI470X,
CONFIG_I2C_SI470X
Reported-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Signed-off-by: Peter Senna Tschudin <peter.senna@gmail.com>
---
Changes from V1:
Updated subject
drivers/media/radio/si470x/radio-si470x.h | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/media/radio/si470x/radio-si470x.h b/drivers/media/radio/si470x/radio-si470x.h
index 2f089b4..467e955 100644
--- a/drivers/media/radio/si470x/radio-si470x.h
+++ b/drivers/media/radio/si470x/radio-si470x.h
@@ -163,7 +163,7 @@ struct si470x_device {
struct completion completion;
bool status_rssi_auto_update; /* Does RSSI get updated automatic? */
-#if defined(CONFIG_USB_SI470X) || defined(CONFIG_USB_SI470X_MODULE)
+#if IS_ENABLED(CONFIG_USB_SI470X)
/* reference to USB and video device */
struct usb_device *usbdev;
struct usb_interface *intf;
@@ -179,7 +179,7 @@ struct si470x_device {
unsigned char hardware_version;
#endif
-#if defined(CONFIG_I2C_SI470X) || defined(CONFIG_I2C_SI470X_MODULE)
+#if IS_ENABLED(CONFIG_I2C_SI470X)
struct i2c_client *client;
#endif
};
--
1.7.11.7
^ permalink raw reply related [flat|nested] 28+ messages in thread* Re: [PATCH V2 05/24] radio/si470x/radio-si470x.h: use IS_ENABLED() macro
2013-01-19 23:41 ` [PATCH V2 05/24] radio/si470x/radio-si470x.h: " Peter Senna Tschudin
@ 2013-01-20 16:03 ` Hans Verkuil
0 siblings, 0 replies; 28+ messages in thread
From: Hans Verkuil @ 2013-01-20 16:03 UTC (permalink / raw)
To: Peter Senna Tschudin; +Cc: mchehab, linux-media, kernel-janitors
On Sun January 20 2013 00:41:12 Peter Senna Tschudin wrote:
> replace:
> #if defined(CONFIG_USB_SI470X) || \
> defined(CONFIG_USB_SI470X_MODULE)
> with:
> #if IS_ENABLED(CONFIG_USB_SI470X)
>
> This change was made for: CONFIG_USB_SI470X,
> CONFIG_I2C_SI470X
>
> Reported-by: Mauro Carvalho Chehab <mchehab@redhat.com>
> Signed-off-by: Peter Senna Tschudin <peter.senna@gmail.com>
Acked-by: Hans Verkuil <hans.verkuil@cisco.com>
Regards,
Hans
> ---
> Changes from V1:
> Updated subject
>
> drivers/media/radio/si470x/radio-si470x.h | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/media/radio/si470x/radio-si470x.h b/drivers/media/radio/si470x/radio-si470x.h
> index 2f089b4..467e955 100644
> --- a/drivers/media/radio/si470x/radio-si470x.h
> +++ b/drivers/media/radio/si470x/radio-si470x.h
> @@ -163,7 +163,7 @@ struct si470x_device {
> struct completion completion;
> bool status_rssi_auto_update; /* Does RSSI get updated automatic? */
>
> -#if defined(CONFIG_USB_SI470X) || defined(CONFIG_USB_SI470X_MODULE)
> +#if IS_ENABLED(CONFIG_USB_SI470X)
> /* reference to USB and video device */
> struct usb_device *usbdev;
> struct usb_interface *intf;
> @@ -179,7 +179,7 @@ struct si470x_device {
> unsigned char hardware_version;
> #endif
>
> -#if defined(CONFIG_I2C_SI470X) || defined(CONFIG_I2C_SI470X_MODULE)
> +#if IS_ENABLED(CONFIG_I2C_SI470X)
> struct i2c_client *client;
> #endif
> };
>
^ permalink raw reply [flat|nested] 28+ messages in thread
* [PATCH V2 06/24] usb/gspca/cpia1.c: use IS_ENABLED() macro
2013-01-19 23:41 [PATCH V2 00/24] [media] use IS_ENABLED() macro Peter Senna Tschudin
` (4 preceding siblings ...)
2013-01-19 23:41 ` [PATCH V2 05/24] radio/si470x/radio-si470x.h: " Peter Senna Tschudin
@ 2013-01-19 23:41 ` Peter Senna Tschudin
2013-01-19 23:41 ` [PATCH V2 07/24] usb/gspca: " Peter Senna Tschudin
` (18 subsequent siblings)
24 siblings, 0 replies; 28+ messages in thread
From: Peter Senna Tschudin @ 2013-01-19 23:41 UTC (permalink / raw)
To: hdegoede; +Cc: mchehab, linux-media, kernel-janitors, Peter Senna Tschudin
replace:
#if defined(CONFIG_INPUT) || \
defined(CONFIG_INPUT_MODULE)
with:
#if IS_ENABLED(CONFIG_INPUT)
This change was made for: CONFIG_INPUT
Reported-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Signed-off-by: Peter Senna Tschudin <peter.senna@gmail.com>
---
Changes from V1:
Updated subject
drivers/media/usb/gspca/cpia1.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/media/usb/gspca/cpia1.c b/drivers/media/usb/gspca/cpia1.c
index b3ba47d..1dcdd9f 100644
--- a/drivers/media/usb/gspca/cpia1.c
+++ b/drivers/media/usb/gspca/cpia1.c
@@ -541,7 +541,7 @@ static int do_command(struct gspca_dev *gspca_dev, u16 command,
/* test button press */
a = ((gspca_dev->usb_buf[1] & 0x02) == 0);
if (a != sd->params.qx3.button) {
-#if defined(CONFIG_INPUT) || defined(CONFIG_INPUT_MODULE)
+#if IS_ENABLED(CONFIG_INPUT)
input_report_key(gspca_dev->input_dev, KEY_CAMERA, a);
input_sync(gspca_dev->input_dev);
#endif
@@ -1640,7 +1640,7 @@ static void sd_stopN(struct gspca_dev *gspca_dev)
/* Update the camera status */
do_command(gspca_dev, CPIA_COMMAND_GetCameraStatus, 0, 0, 0, 0);
-#if defined(CONFIG_INPUT) || defined(CONFIG_INPUT_MODULE)
+#if IS_ENABLED(CONFIG_INPUT)
/* If the last button state is pressed, release it now! */
if (sd->params.qx3.button) {
/* The camera latch will hold the pressed state until we reset
@@ -1869,7 +1869,7 @@ static const struct sd_desc sd_desc = {
.stopN = sd_stopN,
.dq_callback = sd_dq_callback,
.pkt_scan = sd_pkt_scan,
-#if defined(CONFIG_INPUT) || defined(CONFIG_INPUT_MODULE)
+#if IS_ENABLED(CONFIG_INPUT)
.other_input = 1,
#endif
};
--
1.7.11.7
^ permalink raw reply related [flat|nested] 28+ messages in thread* [PATCH V2 07/24] usb/gspca: use IS_ENABLED() macro
2013-01-19 23:41 [PATCH V2 00/24] [media] use IS_ENABLED() macro Peter Senna Tschudin
` (5 preceding siblings ...)
2013-01-19 23:41 ` [PATCH V2 06/24] usb/gspca/cpia1.c: " Peter Senna Tschudin
@ 2013-01-19 23:41 ` Peter Senna Tschudin
2013-01-19 23:41 ` [PATCH V2 08/24] usb/gspca/konica.c: " Peter Senna Tschudin
` (17 subsequent siblings)
24 siblings, 0 replies; 28+ messages in thread
From: Peter Senna Tschudin @ 2013-01-19 23:41 UTC (permalink / raw)
To: hdegoede; +Cc: mchehab, linux-media, kernel-janitors, Peter Senna Tschudin
replace:
#if defined(CONFIG_INPUT) || \
defined(CONFIG_INPUT_MODULE)
with:
#if IS_ENABLED(CONFIG_INPUT)
This change was made for: CONFIG_INPUT
Reported-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Signed-off-by: Peter Senna Tschudin <peter.senna@gmail.com>
---
Changes from V1:
Updated subject
drivers/media/usb/gspca/gspca.c | 10 +++++-----
drivers/media/usb/gspca/gspca.h | 6 +++---
2 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/drivers/media/usb/gspca/gspca.c b/drivers/media/usb/gspca/gspca.c
index e0a431b..3564bdb 100644
--- a/drivers/media/usb/gspca/gspca.c
+++ b/drivers/media/usb/gspca/gspca.c
@@ -44,7 +44,7 @@
#include "gspca.h"
-#if defined(CONFIG_INPUT) || defined(CONFIG_INPUT_MODULE)
+#if IS_ENABLED(CONFIG_INPUT)
#include <linux/input.h>
#include <linux/usb/input.h>
#endif
@@ -118,7 +118,7 @@ static const struct vm_operations_struct gspca_vm_ops = {
/*
* Input and interrupt endpoint handling functions
*/
-#if defined(CONFIG_INPUT) || defined(CONFIG_INPUT_MODULE)
+#if IS_ENABLED(CONFIG_INPUT)
static void int_irq(struct urb *urb)
{
struct gspca_dev *gspca_dev = (struct gspca_dev *) urb->context;
@@ -2303,7 +2303,7 @@ int gspca_dev_probe2(struct usb_interface *intf,
return 0;
out:
-#if defined(CONFIG_INPUT) || defined(CONFIG_INPUT_MODULE)
+#if IS_ENABLED(CONFIG_INPUT)
if (gspca_dev->input_dev)
input_unregister_device(gspca_dev->input_dev);
#endif
@@ -2348,7 +2348,7 @@ EXPORT_SYMBOL(gspca_dev_probe);
void gspca_disconnect(struct usb_interface *intf)
{
struct gspca_dev *gspca_dev = usb_get_intfdata(intf);
-#if defined(CONFIG_INPUT) || defined(CONFIG_INPUT_MODULE)
+#if IS_ENABLED(CONFIG_INPUT)
struct input_dev *input_dev;
#endif
@@ -2360,7 +2360,7 @@ void gspca_disconnect(struct usb_interface *intf)
gspca_dev->present = 0;
destroy_urbs(gspca_dev);
-#if defined(CONFIG_INPUT) || defined(CONFIG_INPUT_MODULE)
+#if IS_ENABLED(CONFIG_INPUT)
gspca_input_destroy_urb(gspca_dev);
input_dev = gspca_dev->input_dev;
if (input_dev) {
diff --git a/drivers/media/usb/gspca/gspca.h b/drivers/media/usb/gspca/gspca.h
index 352317d..5559932 100644
--- a/drivers/media/usb/gspca/gspca.h
+++ b/drivers/media/usb/gspca/gspca.h
@@ -138,7 +138,7 @@ struct sd_desc {
cam_reg_op get_register;
#endif
cam_ident_op get_chip_ident;
-#if defined(CONFIG_INPUT) || defined(CONFIG_INPUT_MODULE)
+#if IS_ENABLED(CONFIG_INPUT)
cam_int_pkt_op int_pkt_scan;
/* other_input makes the gspca core create gspca_dev->input even when
int_pkt_scan is NULL, for cams with non interrupt driven buttons */
@@ -167,7 +167,7 @@ struct gspca_dev {
struct usb_device *dev;
struct file *capt_file; /* file doing video capture */
/* protected by queue_lock */
-#if defined(CONFIG_INPUT) || defined(CONFIG_INPUT_MODULE)
+#if IS_ENABLED(CONFIG_INPUT)
struct input_dev *input_dev;
char phys[64]; /* physical device path */
#endif
@@ -190,7 +190,7 @@ struct gspca_dev {
#define USB_BUF_SZ 64
__u8 *usb_buf; /* buffer for USB exchanges */
struct urb *urb[MAX_NURBS];
-#if defined(CONFIG_INPUT) || defined(CONFIG_INPUT_MODULE)
+#if IS_ENABLED(CONFIG_INPUT)
struct urb *int_urb;
#endif
--
1.7.11.7
^ permalink raw reply related [flat|nested] 28+ messages in thread* [PATCH V2 08/24] usb/gspca/konica.c: use IS_ENABLED() macro
2013-01-19 23:41 [PATCH V2 00/24] [media] use IS_ENABLED() macro Peter Senna Tschudin
` (6 preceding siblings ...)
2013-01-19 23:41 ` [PATCH V2 07/24] usb/gspca: " Peter Senna Tschudin
@ 2013-01-19 23:41 ` Peter Senna Tschudin
2013-01-19 23:41 ` [PATCH V2 09/24] usb/gspca/ov519.c: " Peter Senna Tschudin
` (16 subsequent siblings)
24 siblings, 0 replies; 28+ messages in thread
From: Peter Senna Tschudin @ 2013-01-19 23:41 UTC (permalink / raw)
To: hdegoede; +Cc: mchehab, linux-media, kernel-janitors, Peter Senna Tschudin
replace:
#if defined(CONFIG_INPUT) || \
defined(CONFIG_INPUT_MODULE)
with:
#if IS_ENABLED(CONFIG_INPUT)
This change was made for: CONFIG_INPUT
Reported-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Signed-off-by: Peter Senna Tschudin <peter.senna@gmail.com>
---
Changes from V1:
Updated subject
drivers/media/usb/gspca/konica.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/media/usb/gspca/konica.c b/drivers/media/usb/gspca/konica.c
index bbf91e0..61e25db 100644
--- a/drivers/media/usb/gspca/konica.c
+++ b/drivers/media/usb/gspca/konica.c
@@ -246,7 +246,7 @@ static void sd_stopN(struct gspca_dev *gspca_dev)
struct sd *sd = (struct sd *) gspca_dev;
konica_stream_off(gspca_dev);
-#if defined(CONFIG_INPUT) || defined(CONFIG_INPUT_MODULE)
+#if IS_ENABLED(CONFIG_INPUT)
/* Don't keep the button in the pressed state "forever" if it was
pressed when streaming is stopped */
if (sd->snapshot_pressed) {
@@ -345,7 +345,7 @@ static void sd_isoc_irq(struct urb *urb)
gspca_frame_add(gspca_dev, LAST_PACKET, NULL, 0);
gspca_frame_add(gspca_dev, FIRST_PACKET, NULL, 0);
} else {
-#if defined(CONFIG_INPUT) || defined(CONFIG_INPUT_MODULE)
+#if IS_ENABLED(CONFIG_INPUT)
u8 button_state = st & 0x40 ? 1 : 0;
if (sd->snapshot_pressed != button_state) {
input_report_key(gspca_dev->input_dev,
@@ -452,7 +452,7 @@ static const struct sd_desc sd_desc = {
.init_controls = sd_init_controls,
.start = sd_start,
.stopN = sd_stopN,
-#if defined(CONFIG_INPUT) || defined(CONFIG_INPUT_MODULE)
+#if IS_ENABLED(CONFIG_INPUT)
.other_input = 1,
#endif
};
--
1.7.11.7
^ permalink raw reply related [flat|nested] 28+ messages in thread* [PATCH V2 09/24] usb/gspca/ov519.c: use IS_ENABLED() macro
2013-01-19 23:41 [PATCH V2 00/24] [media] use IS_ENABLED() macro Peter Senna Tschudin
` (7 preceding siblings ...)
2013-01-19 23:41 ` [PATCH V2 08/24] usb/gspca/konica.c: " Peter Senna Tschudin
@ 2013-01-19 23:41 ` Peter Senna Tschudin
2013-01-19 23:41 ` [PATCH V2 10/24] usb/gspca/pac207.c: " Peter Senna Tschudin
` (15 subsequent siblings)
24 siblings, 0 replies; 28+ messages in thread
From: Peter Senna Tschudin @ 2013-01-19 23:41 UTC (permalink / raw)
To: hdegoede; +Cc: mchehab, linux-media, kernel-janitors, Peter Senna Tschudin
replace:
#if defined(CONFIG_INPUT) || \
defined(CONFIG_INPUT_MODULE)
with:
#if IS_ENABLED(CONFIG_INPUT)
This change was made for: CONFIG_INPUT
Reported-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Signed-off-by: Peter Senna Tschudin <peter.senna@gmail.com>
---
Changes from V1:
Updated subject
drivers/media/usb/gspca/ov519.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/media/usb/gspca/ov519.c b/drivers/media/usb/gspca/ov519.c
index 9aa09f8..9ad19a7 100644
--- a/drivers/media/usb/gspca/ov519.c
+++ b/drivers/media/usb/gspca/ov519.c
@@ -4238,7 +4238,7 @@ static void sd_stop0(struct gspca_dev *gspca_dev)
if (sd->bridge == BRIDGE_W9968CF)
w9968cf_stop0(sd);
-#if defined(CONFIG_INPUT) || defined(CONFIG_INPUT_MODULE)
+#if IS_ENABLED(CONFIG_INPUT)
/* If the last button state is pressed, release it now! */
if (sd->snapshot_pressed) {
input_report_key(gspca_dev->input_dev, KEY_CAMERA, 0);
@@ -4255,7 +4255,7 @@ static void ov51x_handle_button(struct gspca_dev *gspca_dev, u8 state)
struct sd *sd = (struct sd *) gspca_dev;
if (sd->snapshot_pressed != state) {
-#if defined(CONFIG_INPUT) || defined(CONFIG_INPUT_MODULE)
+#if IS_ENABLED(CONFIG_INPUT)
input_report_key(gspca_dev->input_dev, KEY_CAMERA, state);
input_sync(gspca_dev->input_dev);
#endif
@@ -4924,7 +4924,7 @@ static const struct sd_desc sd_desc = {
.dq_callback = sd_reset_snapshot,
.get_jcomp = sd_get_jcomp,
.set_jcomp = sd_set_jcomp,
-#if defined(CONFIG_INPUT) || defined(CONFIG_INPUT_MODULE)
+#if IS_ENABLED(CONFIG_INPUT)
.other_input = 1,
#endif
};
--
1.7.11.7
^ permalink raw reply related [flat|nested] 28+ messages in thread* [PATCH V2 10/24] usb/gspca/pac207.c: use IS_ENABLED() macro
2013-01-19 23:41 [PATCH V2 00/24] [media] use IS_ENABLED() macro Peter Senna Tschudin
` (8 preceding siblings ...)
2013-01-19 23:41 ` [PATCH V2 09/24] usb/gspca/ov519.c: " Peter Senna Tschudin
@ 2013-01-19 23:41 ` Peter Senna Tschudin
2013-01-19 23:41 ` [PATCH V2 11/24] gspca/pac7302.c: " Peter Senna Tschudin
` (14 subsequent siblings)
24 siblings, 0 replies; 28+ messages in thread
From: Peter Senna Tschudin @ 2013-01-19 23:41 UTC (permalink / raw)
To: hdegoede; +Cc: mchehab, linux-media, kernel-janitors, Peter Senna Tschudin
replace:
#if defined(CONFIG_INPUT) || \
defined(CONFIG_INPUT_MODULE)
with:
#if IS_ENABLED(CONFIG_INPUT)
This change was made for: CONFIG_INPUT
Reported-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Signed-off-by: Peter Senna Tschudin <peter.senna@gmail.com>
---
Changes from V1:
Updated subject
drivers/media/usb/gspca/pac207.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/media/usb/gspca/pac207.c b/drivers/media/usb/gspca/pac207.c
index 1f253df..3b75097 100644
--- a/drivers/media/usb/gspca/pac207.c
+++ b/drivers/media/usb/gspca/pac207.c
@@ -413,7 +413,7 @@ static void sd_pkt_scan(struct gspca_dev *gspca_dev,
gspca_frame_add(gspca_dev, INTER_PACKET, data, len);
}
-#if defined(CONFIG_INPUT) || defined(CONFIG_INPUT_MODULE)
+#if IS_ENABLED(CONFIG_INPUT)
static int sd_int_pkt_scan(struct gspca_dev *gspca_dev,
u8 *data, /* interrupt packet data */
int len) /* interrput packet length */
@@ -442,7 +442,7 @@ static const struct sd_desc sd_desc = {
.stopN = sd_stopN,
.dq_callback = pac207_do_auto_gain,
.pkt_scan = sd_pkt_scan,
-#if defined(CONFIG_INPUT) || defined(CONFIG_INPUT_MODULE)
+#if IS_ENABLED(CONFIG_INPUT)
.int_pkt_scan = sd_int_pkt_scan,
#endif
};
--
1.7.11.7
^ permalink raw reply related [flat|nested] 28+ messages in thread* [PATCH V2 11/24] gspca/pac7302.c: use IS_ENABLED() macro
2013-01-19 23:41 [PATCH V2 00/24] [media] use IS_ENABLED() macro Peter Senna Tschudin
` (9 preceding siblings ...)
2013-01-19 23:41 ` [PATCH V2 10/24] usb/gspca/pac207.c: " Peter Senna Tschudin
@ 2013-01-19 23:41 ` Peter Senna Tschudin
2013-01-19 23:41 ` [PATCH V2 12/24] usb/gspca/pac7311.c: " Peter Senna Tschudin
` (13 subsequent siblings)
24 siblings, 0 replies; 28+ messages in thread
From: Peter Senna Tschudin @ 2013-01-19 23:41 UTC (permalink / raw)
To: hdegoede; +Cc: mchehab, linux-media, kernel-janitors, Peter Senna Tschudin
replace:
#if defined(CONFIG_INPUT) || \
defined(CONFIG_INPUT_MODULE)
with:
#if IS_ENABLED(CONFIG_INPUT)
This change was made for: CONFIG_INPUT
Reported-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Signed-off-by: Peter Senna Tschudin <peter.senna@gmail.com>
---
Changes from V1:
Updated subject
drivers/media/usb/gspca/pac7302.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/media/usb/gspca/pac7302.c b/drivers/media/usb/gspca/pac7302.c
index 4f5869a..add6f72 100644
--- a/drivers/media/usb/gspca/pac7302.c
+++ b/drivers/media/usb/gspca/pac7302.c
@@ -890,7 +890,7 @@ static int sd_chip_ident(struct gspca_dev *gspca_dev,
}
#endif
-#if defined(CONFIG_INPUT) || defined(CONFIG_INPUT_MODULE)
+#if IS_ENABLED(CONFIG_INPUT)
static int sd_int_pkt_scan(struct gspca_dev *gspca_dev,
u8 *data, /* interrupt packet data */
int len) /* interrput packet length */
@@ -936,7 +936,7 @@ static const struct sd_desc sd_desc = {
.set_register = sd_dbg_s_register,
.get_chip_ident = sd_chip_ident,
#endif
-#if defined(CONFIG_INPUT) || defined(CONFIG_INPUT_MODULE)
+#if IS_ENABLED(CONFIG_INPUT)
.int_pkt_scan = sd_int_pkt_scan,
#endif
};
--
1.7.11.7
^ permalink raw reply related [flat|nested] 28+ messages in thread* [PATCH V2 12/24] usb/gspca/pac7311.c: use IS_ENABLED() macro
2013-01-19 23:41 [PATCH V2 00/24] [media] use IS_ENABLED() macro Peter Senna Tschudin
` (10 preceding siblings ...)
2013-01-19 23:41 ` [PATCH V2 11/24] gspca/pac7302.c: " Peter Senna Tschudin
@ 2013-01-19 23:41 ` Peter Senna Tschudin
2013-01-19 23:41 ` [PATCH V2 13/24] usb/gspca/se401.c: " Peter Senna Tschudin
` (12 subsequent siblings)
24 siblings, 0 replies; 28+ messages in thread
From: Peter Senna Tschudin @ 2013-01-19 23:41 UTC (permalink / raw)
To: hdegoede; +Cc: mchehab, linux-media, kernel-janitors, Peter Senna Tschudin
replace:
#if defined(CONFIG_INPUT) || \
defined(CONFIG_INPUT_MODULE)
with:
#if IS_ENABLED(CONFIG_INPUT)
This change was made for: CONFIG_INPUT
Reported-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Signed-off-by: Peter Senna Tschudin <peter.senna@gmail.com>
---
Changes from V1:
Updated subject
drivers/media/usb/gspca/pac7311.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/media/usb/gspca/pac7311.c b/drivers/media/usb/gspca/pac7311.c
index ba3558d..a12dfbf 100644
--- a/drivers/media/usb/gspca/pac7311.c
+++ b/drivers/media/usb/gspca/pac7311.c
@@ -621,7 +621,7 @@ static void sd_pkt_scan(struct gspca_dev *gspca_dev,
gspca_frame_add(gspca_dev, INTER_PACKET, data, len);
}
-#if defined(CONFIG_INPUT) || defined(CONFIG_INPUT_MODULE)
+#if IS_ENABLED(CONFIG_INPUT)
static int sd_int_pkt_scan(struct gspca_dev *gspca_dev,
u8 *data, /* interrupt packet data */
int len) /* interrupt packet length */
@@ -661,7 +661,7 @@ static const struct sd_desc sd_desc = {
.stopN = sd_stopN,
.pkt_scan = sd_pkt_scan,
.dq_callback = do_autogain,
-#if defined(CONFIG_INPUT) || defined(CONFIG_INPUT_MODULE)
+#if IS_ENABLED(CONFIG_INPUT)
.int_pkt_scan = sd_int_pkt_scan,
#endif
};
--
1.7.11.7
^ permalink raw reply related [flat|nested] 28+ messages in thread* [PATCH V2 13/24] usb/gspca/se401.c: use IS_ENABLED() macro
2013-01-19 23:41 [PATCH V2 00/24] [media] use IS_ENABLED() macro Peter Senna Tschudin
` (11 preceding siblings ...)
2013-01-19 23:41 ` [PATCH V2 12/24] usb/gspca/pac7311.c: " Peter Senna Tschudin
@ 2013-01-19 23:41 ` Peter Senna Tschudin
2013-01-19 23:41 ` [PATCH V2 14/24] usb/gspca/sn9c20x.c: " Peter Senna Tschudin
` (11 subsequent siblings)
24 siblings, 0 replies; 28+ messages in thread
From: Peter Senna Tschudin @ 2013-01-19 23:41 UTC (permalink / raw)
To: hdegoede; +Cc: mchehab, linux-media, kernel-janitors, Peter Senna Tschudin
replace:
#if defined(CONFIG_INPUT) || \
defined(CONFIG_INPUT_MODULE)
with:
#if IS_ENABLED(CONFIG_INPUT)
This change was made for: CONFIG_INPUT
Reported-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Signed-off-by: Peter Senna Tschudin <peter.senna@gmail.com>
---
Changes from V1:
Updated subject
drivers/media/usb/gspca/se401.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/media/usb/gspca/se401.c b/drivers/media/usb/gspca/se401.c
index a33cb78..5f729b8 100644
--- a/drivers/media/usb/gspca/se401.c
+++ b/drivers/media/usb/gspca/se401.c
@@ -594,7 +594,7 @@ static void sd_pkt_scan(struct gspca_dev *gspca_dev, u8 *data, int len)
sd_pkt_scan_janggu(gspca_dev, data, len);
}
-#if defined(CONFIG_INPUT) || defined(CONFIG_INPUT_MODULE)
+#if IS_ENABLED(CONFIG_INPUT)
static int sd_int_pkt_scan(struct gspca_dev *gspca_dev, u8 *data, int len)
{
struct sd *sd = (struct sd *)gspca_dev;
@@ -688,7 +688,7 @@ static const struct sd_desc sd_desc = {
.stopN = sd_stopN,
.dq_callback = sd_dq_callback,
.pkt_scan = sd_pkt_scan,
-#if defined(CONFIG_INPUT) || defined(CONFIG_INPUT_MODULE)
+#if IS_ENABLED(CONFIG_INPUT)
.int_pkt_scan = sd_int_pkt_scan,
#endif
};
--
1.7.11.7
^ permalink raw reply related [flat|nested] 28+ messages in thread* [PATCH V2 14/24] usb/gspca/sn9c20x.c: use IS_ENABLED() macro
2013-01-19 23:41 [PATCH V2 00/24] [media] use IS_ENABLED() macro Peter Senna Tschudin
` (12 preceding siblings ...)
2013-01-19 23:41 ` [PATCH V2 13/24] usb/gspca/se401.c: " Peter Senna Tschudin
@ 2013-01-19 23:41 ` Peter Senna Tschudin
2013-01-19 23:41 ` [PATCH V2 15/24] usb/gspca/sonixb.c: " Peter Senna Tschudin
` (10 subsequent siblings)
24 siblings, 0 replies; 28+ messages in thread
From: Peter Senna Tschudin @ 2013-01-19 23:41 UTC (permalink / raw)
To: brijohn
Cc: hdegoede, mchehab, linux-media, kernel-janitors,
Peter Senna Tschudin
replace:
#if defined(CONFIG_INPUT) || \
defined(CONFIG_INPUT_MODULE)
with:
#if IS_ENABLED(CONFIG_INPUT)
This change was made for: CONFIG_INPUT
Reported-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Signed-off-by: Peter Senna Tschudin <peter.senna@gmail.com>
---
Changes from V1:
Updated subject
drivers/media/usb/gspca/sn9c20x.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/media/usb/gspca/sn9c20x.c b/drivers/media/usb/gspca/sn9c20x.c
index 41f769f..4ec544f 100644
--- a/drivers/media/usb/gspca/sn9c20x.c
+++ b/drivers/media/usb/gspca/sn9c20x.c
@@ -2205,7 +2205,7 @@ static void qual_upd(struct work_struct *work)
mutex_unlock(&gspca_dev->usb_lock);
}
-#if defined(CONFIG_INPUT) || defined(CONFIG_INPUT_MODULE)
+#if IS_ENABLED(CONFIG_INPUT)
static int sd_int_pkt_scan(struct gspca_dev *gspca_dev,
u8 *data, /* interrupt packet */
int len) /* interrupt packet length */
@@ -2349,7 +2349,7 @@ static const struct sd_desc sd_desc = {
.stopN = sd_stopN,
.stop0 = sd_stop0,
.pkt_scan = sd_pkt_scan,
-#if defined(CONFIG_INPUT) || defined(CONFIG_INPUT_MODULE)
+#if IS_ENABLED(CONFIG_INPUT)
.int_pkt_scan = sd_int_pkt_scan,
#endif
.dq_callback = sd_dqcallback,
--
1.7.11.7
^ permalink raw reply related [flat|nested] 28+ messages in thread* [PATCH V2 15/24] usb/gspca/sonixb.c: use IS_ENABLED() macro
2013-01-19 23:41 [PATCH V2 00/24] [media] use IS_ENABLED() macro Peter Senna Tschudin
` (13 preceding siblings ...)
2013-01-19 23:41 ` [PATCH V2 14/24] usb/gspca/sn9c20x.c: " Peter Senna Tschudin
@ 2013-01-19 23:41 ` Peter Senna Tschudin
2013-01-19 23:41 ` [PATCH V2 16/24] usb/gspca/sonixj.c: " Peter Senna Tschudin
` (9 subsequent siblings)
24 siblings, 0 replies; 28+ messages in thread
From: Peter Senna Tschudin @ 2013-01-19 23:41 UTC (permalink / raw)
To: hdegoede; +Cc: mchehab, linux-media, kernel-janitors, Peter Senna Tschudin
replace:
#if defined(CONFIG_INPUT) || \
defined(CONFIG_INPUT_MODULE)
with:
#if IS_ENABLED(CONFIG_INPUT)
This change was made for: CONFIG_INPUT
Also replaced:
#if !defined CONFIG_USB_SN9C102 && !defined CONFIG_USB_SN9C102_MODULE
with:
#if !IS_ENABLED(CONFIG_USB_SN9C102)
Reported-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Signed-off-by: Peter Senna Tschudin <peter.senna@gmail.com>
---
Changes from V1:
Updated subject
Fixed commit message
drivers/media/usb/gspca/sonixb.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/media/usb/gspca/sonixb.c b/drivers/media/usb/gspca/sonixb.c
index 1220340..104ae25 100644
--- a/drivers/media/usb/gspca/sonixb.c
+++ b/drivers/media/usb/gspca/sonixb.c
@@ -1400,7 +1400,7 @@ static int sd_querymenu(struct gspca_dev *gspca_dev,
return -EINVAL;
}
-#if defined(CONFIG_INPUT) || defined(CONFIG_INPUT_MODULE)
+#if IS_ENABLED(CONFIG_INPUT)
static int sd_int_pkt_scan(struct gspca_dev *gspca_dev,
u8 *data, /* interrupt packet data */
int len) /* interrupt packet length */
@@ -1430,7 +1430,7 @@ static const struct sd_desc sd_desc = {
.pkt_scan = sd_pkt_scan,
.querymenu = sd_querymenu,
.dq_callback = do_autogain,
-#if defined(CONFIG_INPUT) || defined(CONFIG_INPUT_MODULE)
+#if IS_ENABLED(CONFIG_INPUT)
.int_pkt_scan = sd_int_pkt_scan,
#endif
};
@@ -1448,7 +1448,7 @@ static const struct usb_device_id device_table[] = {
{USB_DEVICE(0x0c45, 0x600d), SB(PAS106, 101)},
{USB_DEVICE(0x0c45, 0x6011), SB(OV6650, 101)},
{USB_DEVICE(0x0c45, 0x6019), SB(OV7630, 101)},
-#if !defined CONFIG_USB_SN9C102 && !defined CONFIG_USB_SN9C102_MODULE
+#if !IS_ENABLED(CONFIG_USB_SN9C102)
{USB_DEVICE(0x0c45, 0x6024), SB(TAS5130CXX, 102)},
{USB_DEVICE(0x0c45, 0x6025), SB(TAS5130CXX, 102)},
#endif
--
1.7.11.7
^ permalink raw reply related [flat|nested] 28+ messages in thread* [PATCH V2 16/24] usb/gspca/sonixj.c: use IS_ENABLED() macro
2013-01-19 23:41 [PATCH V2 00/24] [media] use IS_ENABLED() macro Peter Senna Tschudin
` (14 preceding siblings ...)
2013-01-19 23:41 ` [PATCH V2 15/24] usb/gspca/sonixb.c: " Peter Senna Tschudin
@ 2013-01-19 23:41 ` Peter Senna Tschudin
2013-01-19 23:41 ` [PATCH V2 17/24] usb/gspca/spca561.c: " Peter Senna Tschudin
` (8 subsequent siblings)
24 siblings, 0 replies; 28+ messages in thread
From: Peter Senna Tschudin @ 2013-01-19 23:41 UTC (permalink / raw)
To: hdegoede; +Cc: mchehab, linux-media, kernel-janitors, Peter Senna Tschudin
replace:
#if defined(CONFIG_INPUT) || \
defined(CONFIG_INPUT_MODULE)
with:
#if IS_ENABLED(CONFIG_INPUT)
This change was made for: CONFIG_INPUT
Reported-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Signed-off-by: Peter Senna Tschudin <peter.senna@gmail.com>
---
Changes from V1:
Updated subject
drivers/media/usb/gspca/sonixj.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/media/usb/gspca/sonixj.c b/drivers/media/usb/gspca/sonixj.c
index 36307a9..671d0c6 100644
--- a/drivers/media/usb/gspca/sonixj.c
+++ b/drivers/media/usb/gspca/sonixj.c
@@ -3077,7 +3077,7 @@ static int sd_querymenu(struct gspca_dev *gspca_dev,
return -EINVAL;
}
-#if defined(CONFIG_INPUT) || defined(CONFIG_INPUT_MODULE)
+#if IS_ENABLED(CONFIG_INPUT)
static int sd_int_pkt_scan(struct gspca_dev *gspca_dev,
u8 *data, /* interrupt packet data */
int len) /* interrupt packet length */
@@ -3109,7 +3109,7 @@ static const struct sd_desc sd_desc = {
.pkt_scan = sd_pkt_scan,
.dq_callback = do_autogain,
.querymenu = sd_querymenu,
-#if defined(CONFIG_INPUT) || defined(CONFIG_INPUT_MODULE)
+#if IS_ENABLED(CONFIG_INPUT)
.int_pkt_scan = sd_int_pkt_scan,
#endif
};
--
1.7.11.7
^ permalink raw reply related [flat|nested] 28+ messages in thread* [PATCH V2 17/24] usb/gspca/spca561.c: use IS_ENABLED() macro
2013-01-19 23:41 [PATCH V2 00/24] [media] use IS_ENABLED() macro Peter Senna Tschudin
` (15 preceding siblings ...)
2013-01-19 23:41 ` [PATCH V2 16/24] usb/gspca/sonixj.c: " Peter Senna Tschudin
@ 2013-01-19 23:41 ` Peter Senna Tschudin
2013-01-19 23:41 ` [PATCH V2 18/24] usb/gspca/stv06xx/stv06xx.c: " Peter Senna Tschudin
` (7 subsequent siblings)
24 siblings, 0 replies; 28+ messages in thread
From: Peter Senna Tschudin @ 2013-01-19 23:41 UTC (permalink / raw)
To: hdegoede; +Cc: mchehab, linux-media, kernel-janitors, Peter Senna Tschudin
replace:
#if defined(CONFIG_INPUT) || \
defined(CONFIG_INPUT_MODULE)
with:
#if IS_ENABLED(CONFIG_INPUT)
This change was made for: CONFIG_INPUT
Reported-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Signed-off-by: Peter Senna Tschudin <peter.senna@gmail.com>
---
Changes from V1:
Updated subject
drivers/media/usb/gspca/spca561.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/media/usb/gspca/spca561.c b/drivers/media/usb/gspca/spca561.c
index cfe71dd..d1db3d8 100644
--- a/drivers/media/usb/gspca/spca561.c
+++ b/drivers/media/usb/gspca/spca561.c
@@ -741,7 +741,7 @@ static void sd_pkt_scan(struct gspca_dev *gspca_dev,
return;
}
-#if defined(CONFIG_INPUT) || defined(CONFIG_INPUT_MODULE)
+#if IS_ENABLED(CONFIG_INPUT)
if (data[0] & 0x20) {
input_report_key(gspca_dev->input_dev, KEY_CAMERA, 1);
input_sync(gspca_dev->input_dev);
@@ -866,7 +866,7 @@ static const struct sd_desc sd_desc_12a = {
.start = sd_start_12a,
.stopN = sd_stopN,
.pkt_scan = sd_pkt_scan,
-#if defined(CONFIG_INPUT) || defined(CONFIG_INPUT_MODULE)
+#if IS_ENABLED(CONFIG_INPUT)
.other_input = 1,
#endif
};
@@ -879,7 +879,7 @@ static const struct sd_desc sd_desc_72a = {
.stopN = sd_stopN,
.pkt_scan = sd_pkt_scan,
.dq_callback = do_autogain,
-#if defined(CONFIG_INPUT) || defined(CONFIG_INPUT_MODULE)
+#if IS_ENABLED(CONFIG_INPUT)
.other_input = 1,
#endif
};
--
1.7.11.7
^ permalink raw reply related [flat|nested] 28+ messages in thread* [PATCH V2 18/24] usb/gspca/stv06xx/stv06xx.c: use IS_ENABLED() macro
2013-01-19 23:41 [PATCH V2 00/24] [media] use IS_ENABLED() macro Peter Senna Tschudin
` (16 preceding siblings ...)
2013-01-19 23:41 ` [PATCH V2 17/24] usb/gspca/spca561.c: " Peter Senna Tschudin
@ 2013-01-19 23:41 ` Peter Senna Tschudin
2013-01-19 23:41 ` [PATCH V2 19/24] usb/gspca/t613.c: " Peter Senna Tschudin
` (6 subsequent siblings)
24 siblings, 0 replies; 28+ messages in thread
From: Peter Senna Tschudin @ 2013-01-19 23:41 UTC (permalink / raw)
To: hdegoede; +Cc: mchehab, hans.verkuil, peter.senna, linux-media, kernel-janitors
replace:
#if defined(CONFIG_INPUT) || \
defined(CONFIG_INPUT_MODULE)
with:
#if IS_ENABLED(CONFIG_INPUT)
This change was made for: CONFIG_INPUT
Reported-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Signed-off-by: Peter Senna Tschudin <peter.senna@gmail.com>
---
Changes from V1:
Updated subject
drivers/media/usb/gspca/stv06xx/stv06xx.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/media/usb/gspca/stv06xx/stv06xx.c b/drivers/media/usb/gspca/stv06xx/stv06xx.c
index 999ec77..657160b 100644
--- a/drivers/media/usb/gspca/stv06xx/stv06xx.c
+++ b/drivers/media/usb/gspca/stv06xx/stv06xx.c
@@ -492,7 +492,7 @@ frame_data:
}
}
-#if defined(CONFIG_INPUT) || defined(CONFIG_INPUT_MODULE)
+#if IS_ENABLED(CONFIG_INPUT)
static int sd_int_pkt_scan(struct gspca_dev *gspca_dev,
u8 *data, /* interrupt packet data */
int len) /* interrupt packet length */
@@ -529,7 +529,7 @@ static const struct sd_desc sd_desc = {
.pkt_scan = stv06xx_pkt_scan,
.isoc_init = stv06xx_isoc_init,
.isoc_nego = stv06xx_isoc_nego,
-#if defined(CONFIG_INPUT) || defined(CONFIG_INPUT_MODULE)
+#if IS_ENABLED(CONFIG_INPUT)
.int_pkt_scan = sd_int_pkt_scan,
#endif
};
--
1.7.11.7
^ permalink raw reply related [flat|nested] 28+ messages in thread* [PATCH V2 19/24] usb/gspca/t613.c: use IS_ENABLED() macro
2013-01-19 23:41 [PATCH V2 00/24] [media] use IS_ENABLED() macro Peter Senna Tschudin
` (17 preceding siblings ...)
2013-01-19 23:41 ` [PATCH V2 18/24] usb/gspca/stv06xx/stv06xx.c: " Peter Senna Tschudin
@ 2013-01-19 23:41 ` Peter Senna Tschudin
2013-01-19 23:41 ` [PATCH V2 20/24] usb/gspca/xirlink_cit.c: " Peter Senna Tschudin
` (5 subsequent siblings)
24 siblings, 0 replies; 28+ messages in thread
From: Peter Senna Tschudin @ 2013-01-19 23:41 UTC (permalink / raw)
To: lcostantino
Cc: hdegoede, mchehab, linux-media, kernel-janitors,
Peter Senna Tschudin
replace:
#if defined(CONFIG_INPUT) || \
defined(CONFIG_INPUT_MODULE)
with:
#if IS_ENABLED(CONFIG_INPUT)
This change was made for: CONFIG_INPUT
Reported-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Signed-off-by: Peter Senna Tschudin <peter.senna@gmail.com>
---
Changes from V1:
Updated subject
drivers/media/usb/gspca/t613.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/media/usb/gspca/t613.c b/drivers/media/usb/gspca/t613.c
index b92d4ef..e2cc4e5 100644
--- a/drivers/media/usb/gspca/t613.c
+++ b/drivers/media/usb/gspca/t613.c
@@ -823,7 +823,7 @@ static void sd_stopN(struct gspca_dev *gspca_dev)
msleep(20);
reg_w(gspca_dev, 0x0309);
}
-#if defined(CONFIG_INPUT) || defined(CONFIG_INPUT_MODULE)
+#if IS_ENABLED(CONFIG_INPUT)
/* If the last button state is pressed, release it now! */
if (sd->button_pressed) {
input_report_key(gspca_dev->input_dev, KEY_CAMERA, 0);
@@ -841,7 +841,7 @@ static void sd_pkt_scan(struct gspca_dev *gspca_dev,
int pkt_type;
if (data[0] == 0x5a) {
-#if defined(CONFIG_INPUT) || defined(CONFIG_INPUT_MODULE)
+#if IS_ENABLED(CONFIG_INPUT)
if (len > 20) {
u8 state = (data[20] & 0x80) ? 1 : 0;
if (sd->button_pressed != state) {
@@ -1019,7 +1019,7 @@ static const struct sd_desc sd_desc = {
.start = sd_start,
.stopN = sd_stopN,
.pkt_scan = sd_pkt_scan,
-#if defined(CONFIG_INPUT) || defined(CONFIG_INPUT_MODULE)
+#if IS_ENABLED(CONFIG_INPUT)
.other_input = 1,
#endif
};
--
1.7.11.7
^ permalink raw reply related [flat|nested] 28+ messages in thread* [PATCH V2 20/24] usb/gspca/xirlink_cit.c: use IS_ENABLED() macro
2013-01-19 23:41 [PATCH V2 00/24] [media] use IS_ENABLED() macro Peter Senna Tschudin
` (18 preceding siblings ...)
2013-01-19 23:41 ` [PATCH V2 19/24] usb/gspca/t613.c: " Peter Senna Tschudin
@ 2013-01-19 23:41 ` Peter Senna Tschudin
2013-01-19 23:41 ` [PATCH V2 21/24] usb/gspca/zc3xx.c: " Peter Senna Tschudin
` (4 subsequent siblings)
24 siblings, 0 replies; 28+ messages in thread
From: Peter Senna Tschudin @ 2013-01-19 23:41 UTC (permalink / raw)
To: hdegoede; +Cc: mchehab, linux-media, kernel-janitors, Peter Senna Tschudin
replace:
#if defined(CONFIG_INPUT) || \
defined(CONFIG_INPUT_MODULE)
with:
#if IS_ENABLED(CONFIG_INPUT)
This change was made for: CONFIG_INPUT
Reported-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Signed-off-by: Peter Senna Tschudin <peter.senna@gmail.com>
---
Changes from V1:
Updated subject
drivers/media/usb/gspca/xirlink_cit.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/drivers/media/usb/gspca/xirlink_cit.c b/drivers/media/usb/gspca/xirlink_cit.c
index d4b23c9..7eaf64e 100644
--- a/drivers/media/usb/gspca/xirlink_cit.c
+++ b/drivers/media/usb/gspca/xirlink_cit.c
@@ -2759,7 +2759,7 @@ static void sd_stop0(struct gspca_dev *gspca_dev)
break;
}
-#if defined(CONFIG_INPUT) || defined(CONFIG_INPUT_MODULE)
+#if IS_ENABLED(CONFIG_INPUT)
/* If the last button state is pressed, release it now! */
if (sd->button_state) {
input_report_key(gspca_dev->input_dev, KEY_CAMERA, 0);
@@ -2914,7 +2914,7 @@ static void sd_pkt_scan(struct gspca_dev *gspca_dev,
gspca_frame_add(gspca_dev, INTER_PACKET, data, len);
}
-#if defined(CONFIG_INPUT) || defined(CONFIG_INPUT_MODULE)
+#if IS_ENABLED(CONFIG_INPUT)
static void cit_check_button(struct gspca_dev *gspca_dev)
{
int new_button_state;
@@ -3062,7 +3062,7 @@ static const struct sd_desc sd_desc = {
.stopN = sd_stopN,
.stop0 = sd_stop0,
.pkt_scan = sd_pkt_scan,
-#if defined(CONFIG_INPUT) || defined(CONFIG_INPUT_MODULE)
+#if IS_ENABLED(CONFIG_INPUT)
.dq_callback = cit_check_button,
.other_input = 1,
#endif
@@ -3079,7 +3079,7 @@ static const struct sd_desc sd_desc_isoc_nego = {
.stopN = sd_stopN,
.stop0 = sd_stop0,
.pkt_scan = sd_pkt_scan,
-#if defined(CONFIG_INPUT) || defined(CONFIG_INPUT_MODULE)
+#if IS_ENABLED(CONFIG_INPUT)
.dq_callback = cit_check_button,
.other_input = 1,
#endif
--
1.7.11.7
^ permalink raw reply related [flat|nested] 28+ messages in thread* [PATCH V2 21/24] usb/gspca/zc3xx.c: use IS_ENABLED() macro
2013-01-19 23:41 [PATCH V2 00/24] [media] use IS_ENABLED() macro Peter Senna Tschudin
` (19 preceding siblings ...)
2013-01-19 23:41 ` [PATCH V2 20/24] usb/gspca/xirlink_cit.c: " Peter Senna Tschudin
@ 2013-01-19 23:41 ` Peter Senna Tschudin
2013-01-19 23:41 ` [PATCH V2 22/24] usb/hdpvr/hdpvr-core.c: " Peter Senna Tschudin
` (3 subsequent siblings)
24 siblings, 0 replies; 28+ messages in thread
From: Peter Senna Tschudin @ 2013-01-19 23:41 UTC (permalink / raw)
To: hdegoede; +Cc: mchehab, linux-media, kernel-janitors, Peter Senna Tschudin
replace:
#if defined(CONFIG_INPUT) || \
defined(CONFIG_INPUT_MODULE)
with:
#if IS_ENABLED(CONFIG_INPUT)
This change was made for: CONFIG_INPUT
Reported-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Signed-off-by: Peter Senna Tschudin <peter.senna@gmail.com>
---
Changes from V1:
Updated subject
drivers/media/usb/gspca/zc3xx.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/media/usb/gspca/zc3xx.c b/drivers/media/usb/gspca/zc3xx.c
index 77c5775..a8dc421 100644
--- a/drivers/media/usb/gspca/zc3xx.c
+++ b/drivers/media/usb/gspca/zc3xx.c
@@ -6902,7 +6902,7 @@ static int sd_get_jcomp(struct gspca_dev *gspca_dev,
return 0;
}
-#if defined(CONFIG_INPUT) || defined(CONFIG_INPUT_MODULE)
+#if IS_ENABLED(CONFIG_INPUT)
static int sd_int_pkt_scan(struct gspca_dev *gspca_dev,
u8 *data, /* interrupt packet data */
int len) /* interrput packet length */
@@ -6929,7 +6929,7 @@ static const struct sd_desc sd_desc = {
.pkt_scan = sd_pkt_scan,
.get_jcomp = sd_get_jcomp,
.set_jcomp = sd_set_jcomp,
-#if defined(CONFIG_INPUT) || defined(CONFIG_INPUT_MODULE)
+#if IS_ENABLED(CONFIG_INPUT)
.int_pkt_scan = sd_int_pkt_scan,
#endif
};
--
1.7.11.7
^ permalink raw reply related [flat|nested] 28+ messages in thread* [PATCH V2 22/24] usb/hdpvr/hdpvr-core.c: use IS_ENABLED() macro
2013-01-19 23:41 [PATCH V2 00/24] [media] use IS_ENABLED() macro Peter Senna Tschudin
` (20 preceding siblings ...)
2013-01-19 23:41 ` [PATCH V2 21/24] usb/gspca/zc3xx.c: " Peter Senna Tschudin
@ 2013-01-19 23:41 ` Peter Senna Tschudin
2013-01-19 23:41 ` [PATCH V2 23/24] usb/hdpvr/hdpvr-i2c.c: " Peter Senna Tschudin
` (2 subsequent siblings)
24 siblings, 0 replies; 28+ messages in thread
From: Peter Senna Tschudin @ 2013-01-19 23:41 UTC (permalink / raw)
To: mchehab; +Cc: jarod, tralph, peter.senna, gregkh, linux-media, kernel-janitors
replace:
#if defined(CONFIG_I2C) || \
defined(CONFIG_I2C_MODULE)
with:
#if IS_ENABLED(CONFIG_I2C)
This change was made for: CONFIG_I2C
Reported-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Signed-off-by: Peter Senna Tschudin <peter.senna@gmail.com>
---
Changes from V1:
Updated subject
drivers/media/usb/hdpvr/hdpvr-core.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/media/usb/hdpvr/hdpvr-core.c b/drivers/media/usb/hdpvr/hdpvr-core.c
index 84dc26f..5c61935 100644
--- a/drivers/media/usb/hdpvr/hdpvr-core.c
+++ b/drivers/media/usb/hdpvr/hdpvr-core.c
@@ -391,7 +391,7 @@ static int hdpvr_probe(struct usb_interface *interface,
goto error;
}
-#if defined(CONFIG_I2C) || defined(CONFIG_I2C_MODULE)
+#if IS_ENABLED(CONFIG_I2C)
retval = hdpvr_register_i2c_adapter(dev);
if (retval < 0) {
v4l2_err(&dev->v4l2_dev, "i2c adapter register failed\n");
@@ -419,7 +419,7 @@ static int hdpvr_probe(struct usb_interface *interface,
return 0;
reg_fail:
-#if defined(CONFIG_I2C) || defined(CONFIG_I2C_MODULE)
+#if IS_ENABLED(CONFIG_I2C)
i2c_del_adapter(&dev->i2c_adapter);
#endif
error:
@@ -451,7 +451,7 @@ static void hdpvr_disconnect(struct usb_interface *interface)
mutex_lock(&dev->io_mutex);
hdpvr_cancel_queue(dev);
mutex_unlock(&dev->io_mutex);
-#if defined(CONFIG_I2C) || defined(CONFIG_I2C_MODULE)
+#if IS_ENABLED(CONFIG_I2C)
i2c_del_adapter(&dev->i2c_adapter);
#endif
video_unregister_device(dev->video_dev);
--
1.7.11.7
^ permalink raw reply related [flat|nested] 28+ messages in thread* [PATCH V2 23/24] usb/hdpvr/hdpvr-i2c.c: use IS_ENABLED() macro
2013-01-19 23:41 [PATCH V2 00/24] [media] use IS_ENABLED() macro Peter Senna Tschudin
` (21 preceding siblings ...)
2013-01-19 23:41 ` [PATCH V2 22/24] usb/hdpvr/hdpvr-core.c: " Peter Senna Tschudin
@ 2013-01-19 23:41 ` Peter Senna Tschudin
2013-01-19 23:41 ` [PATCH V2 24/24] v4l2-core/v4l2-common.c: " Peter Senna Tschudin
2013-01-20 1:33 ` [PATCH V2 00/24] [media] " Nikola Pajkovsky
24 siblings, 0 replies; 28+ messages in thread
From: Peter Senna Tschudin @ 2013-01-19 23:41 UTC (permalink / raw)
To: mchehab; +Cc: peter.senna, david, elezegarcia, linux-media, kernel-janitors
replace:
#if defined(CONFIG_I2C) || \
defined(CONFIG_I2C_MODULE)
with:
#if IS_ENABLED(CONFIG_I2C)
This change was made for: CONFIG_I2C
Reported-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Signed-off-by: Peter Senna Tschudin <peter.senna@gmail.com>
---
Changes from V1:
Updated subject
drivers/media/usb/hdpvr/hdpvr-i2c.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/media/usb/hdpvr/hdpvr-i2c.c b/drivers/media/usb/hdpvr/hdpvr-i2c.c
index 6c5054f..a38f58c 100644
--- a/drivers/media/usb/hdpvr/hdpvr-i2c.c
+++ b/drivers/media/usb/hdpvr/hdpvr-i2c.c
@@ -13,7 +13,7 @@
*
*/
-#if defined(CONFIG_I2C) || defined(CONFIG_I2C_MODULE)
+#if IS_ENABLED(CONFIG_I2C)
#include <linux/i2c.h>
#include <linux/slab.h>
--
1.7.11.7
^ permalink raw reply related [flat|nested] 28+ messages in thread* [PATCH V2 24/24] v4l2-core/v4l2-common.c: use IS_ENABLED() macro
2013-01-19 23:41 [PATCH V2 00/24] [media] use IS_ENABLED() macro Peter Senna Tschudin
` (22 preceding siblings ...)
2013-01-19 23:41 ` [PATCH V2 23/24] usb/hdpvr/hdpvr-i2c.c: " Peter Senna Tschudin
@ 2013-01-19 23:41 ` Peter Senna Tschudin
2013-01-21 9:39 ` Hans Verkuil
2013-01-20 1:33 ` [PATCH V2 00/24] [media] " Nikola Pajkovsky
24 siblings, 1 reply; 28+ messages in thread
From: Peter Senna Tschudin @ 2013-01-19 23:41 UTC (permalink / raw)
To: mchehab
Cc: hans.verkuil, sakari.ailus, dhowells, linux-media,
kernel-janitors, Peter Senna Tschudin
replace:
#if defined(CONFIG_MEDIA_TUNER_TEA5761) || \
defined(CONFIG_MEDIA_TUNER_TEA5761_MODULE)
with:
#if IS_ENABLED(CONFIG_MEDIA_TUNER_TEA5761)
This change was made for: CONFIG_MEDIA_TUNER_TEA5761
Also replaced:
#if defined(CONFIG_I2C) || (defined(CONFIG_I2C_MODULE) && defined(MODULE))
with:
#if IS_ENABLED(CONFIG_I2C)
Reported-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Signed-off-by: Peter Senna Tschudin <peter.senna@gmail.com>
---
Changes from V1:
Updated subject
Fixed commit message
drivers/media/v4l2-core/v4l2-common.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/media/v4l2-core/v4l2-common.c b/drivers/media/v4l2-core/v4l2-common.c
index 614316f..aa044f4 100644
--- a/drivers/media/v4l2-core/v4l2-common.c
+++ b/drivers/media/v4l2-core/v4l2-common.c
@@ -238,7 +238,7 @@ int v4l2_chip_match_host(const struct v4l2_dbg_match *match)
}
EXPORT_SYMBOL(v4l2_chip_match_host);
-#if defined(CONFIG_I2C) || (defined(CONFIG_I2C_MODULE) && defined(MODULE))
+#if IS_ENABLED(CONFIG_I2C)
int v4l2_chip_match_i2c_client(struct i2c_client *c, const struct v4l2_dbg_match *match)
{
int len;
@@ -384,7 +384,7 @@ EXPORT_SYMBOL_GPL(v4l2_i2c_subdev_addr);
const unsigned short *v4l2_i2c_tuner_addrs(enum v4l2_i2c_tuner_type type)
{
static const unsigned short radio_addrs[] = {
-#if defined(CONFIG_MEDIA_TUNER_TEA5761) || defined(CONFIG_MEDIA_TUNER_TEA5761_MODULE)
+#if IS_ENABLED(CONFIG_MEDIA_TUNER_TEA5761)
0x10,
#endif
0x60,
--
1.7.11.7
^ permalink raw reply related [flat|nested] 28+ messages in thread* Re: [PATCH V2 24/24] v4l2-core/v4l2-common.c: use IS_ENABLED() macro
2013-01-19 23:41 ` [PATCH V2 24/24] v4l2-core/v4l2-common.c: " Peter Senna Tschudin
@ 2013-01-21 9:39 ` Hans Verkuil
0 siblings, 0 replies; 28+ messages in thread
From: Hans Verkuil @ 2013-01-21 9:39 UTC (permalink / raw)
To: Peter Senna Tschudin
Cc: mchehab, hans.verkuil, sakari.ailus, dhowells, linux-media,
kernel-janitors
On Sun January 20 2013 00:41:31 Peter Senna Tschudin wrote:
> replace:
> #if defined(CONFIG_MEDIA_TUNER_TEA5761) || \
> defined(CONFIG_MEDIA_TUNER_TEA5761_MODULE)
> with:
> #if IS_ENABLED(CONFIG_MEDIA_TUNER_TEA5761)
>
> This change was made for: CONFIG_MEDIA_TUNER_TEA5761
>
> Also replaced:
> #if defined(CONFIG_I2C) || (defined(CONFIG_I2C_MODULE) && defined(MODULE))
> with:
> #if IS_ENABLED(CONFIG_I2C)
>
> Reported-by: Mauro Carvalho Chehab <mchehab@redhat.com>
> Signed-off-by: Peter Senna Tschudin <peter.senna@gmail.com>
Acked-by: Hans Verkuil <hans.verkuil@cisco.com>
Regards,
Hans
> ---
> Changes from V1:
> Updated subject
> Fixed commit message
>
> drivers/media/v4l2-core/v4l2-common.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/media/v4l2-core/v4l2-common.c b/drivers/media/v4l2-core/v4l2-common.c
> index 614316f..aa044f4 100644
> --- a/drivers/media/v4l2-core/v4l2-common.c
> +++ b/drivers/media/v4l2-core/v4l2-common.c
> @@ -238,7 +238,7 @@ int v4l2_chip_match_host(const struct v4l2_dbg_match *match)
> }
> EXPORT_SYMBOL(v4l2_chip_match_host);
>
> -#if defined(CONFIG_I2C) || (defined(CONFIG_I2C_MODULE) && defined(MODULE))
> +#if IS_ENABLED(CONFIG_I2C)
> int v4l2_chip_match_i2c_client(struct i2c_client *c, const struct v4l2_dbg_match *match)
> {
> int len;
> @@ -384,7 +384,7 @@ EXPORT_SYMBOL_GPL(v4l2_i2c_subdev_addr);
> const unsigned short *v4l2_i2c_tuner_addrs(enum v4l2_i2c_tuner_type type)
> {
> static const unsigned short radio_addrs[] = {
> -#if defined(CONFIG_MEDIA_TUNER_TEA5761) || defined(CONFIG_MEDIA_TUNER_TEA5761_MODULE)
> +#if IS_ENABLED(CONFIG_MEDIA_TUNER_TEA5761)
> 0x10,
> #endif
> 0x60,
>
^ permalink raw reply [flat|nested] 28+ messages in thread
* Re: [PATCH V2 00/24] [media] use IS_ENABLED() macro
2013-01-19 23:41 [PATCH V2 00/24] [media] use IS_ENABLED() macro Peter Senna Tschudin
` (23 preceding siblings ...)
2013-01-19 23:41 ` [PATCH V2 24/24] v4l2-core/v4l2-common.c: " Peter Senna Tschudin
@ 2013-01-20 1:33 ` Nikola Pajkovsky
24 siblings, 0 replies; 28+ messages in thread
From: Nikola Pajkovsky @ 2013-01-20 1:33 UTC (permalink / raw)
To: Peter Senna Tschudin; +Cc: mchehab, n.pajkovsky, linux-media, kernel-janitors
Peter Senna Tschudin <peter.senna@gmail.com> writes:
> This patch series introduce the use of IS_ENABLED() macro.
> For example replace:
> #if defined(CONFIG_VIDEO_CX88_DVB) || \
> defined(CONFIG_VIDEO_CX88_DVB_MODULE)
> with:
> #if IS_ENABLED(CONFIG_VIDEO_CX88_DVB)
>
> Changes from V1:
> Updated subject
> Fixed commit message of patch 15/24
> Fixed commit message of patch 24/24
>
> Peter Senna Tschudin (24):
> pci/cx88/cx88.h: use IS_ENABLED() macro
> pci/saa7134/saa7134.h: use IS_ENABLED() macro
> pci/ttpci/av7110.c: use IS_ENABLED() macro
> platform/marvell-ccic/mcam-core.h: use IS_ENABLED() macro
> radio/si470x/radio-si470x.h: use IS_ENABLED() macro
> usb/gspca/cpia1.c: use IS_ENABLED() macro
> usb/gspca: use IS_ENABLED() macro
> usb/gspca/konica.c: use IS_ENABLED() macro
> usb/gspca/ov519.c: use IS_ENABLED() macro
> usb/gspca/pac207.c: use IS_ENABLED() macro
> gspca/pac7302.c: use IS_ENABLED() macro
> usb/gspca/pac7311.c: use IS_ENABLED() macro
> usb/gspca/se401.c: use IS_ENABLED() macro
> usb/gspca/sn9c20x.c: use IS_ENABLED() macro
> usb/gspca/sonixb.c: use IS_ENABLED() macro
> usb/gspca/sonixj.c: use IS_ENABLED() macro
> usb/gspca/spca561.c: use IS_ENABLED() macro
> usb/gspca/stv06xx/stv06xx.c: use IS_ENABLED() macro
> usb/gspca/t613.c: use IS_ENABLED() macro
> usb/gspca/xirlink_cit.c: use IS_ENABLED() macro
> usb/gspca/zc3xx.c: use IS_ENABLED() macro
> usb/hdpvr/hdpvr-core.c: use IS_ENABLED() macro
> usb/hdpvr/hdpvr-i2c.c: use IS_ENABLED() macro
> v4l2-core/v4l2-common.c: use IS_ENABLED() macro
>
> drivers/media/pci/cx88/cx88.h | 10 ++++------
> drivers/media/pci/saa7134/saa7134.h | 4 ++--
> drivers/media/pci/ttpci/av7110.c | 10 +++++-----
> drivers/media/platform/marvell-ccic/mcam-core.h | 6 +++---
> drivers/media/radio/si470x/radio-si470x.h | 4 ++--
> drivers/media/usb/gspca/cpia1.c | 6 +++---
> drivers/media/usb/gspca/gspca.c | 10 +++++-----
> drivers/media/usb/gspca/gspca.h | 6 +++---
> drivers/media/usb/gspca/konica.c | 6 +++---
> drivers/media/usb/gspca/ov519.c | 6 +++---
> drivers/media/usb/gspca/pac207.c | 4 ++--
> drivers/media/usb/gspca/pac7302.c | 4 ++--
> drivers/media/usb/gspca/pac7311.c | 4 ++--
> drivers/media/usb/gspca/se401.c | 4 ++--
> drivers/media/usb/gspca/sn9c20x.c | 4 ++--
> drivers/media/usb/gspca/sonixb.c | 6 +++---
> drivers/media/usb/gspca/sonixj.c | 4 ++--
> drivers/media/usb/gspca/spca561.c | 6 +++---
> drivers/media/usb/gspca/stv06xx/stv06xx.c | 4 ++--
> drivers/media/usb/gspca/t613.c | 6 +++---
> drivers/media/usb/gspca/xirlink_cit.c | 8 ++++----
> drivers/media/usb/gspca/zc3xx.c | 4 ++--
> drivers/media/usb/hdpvr/hdpvr-core.c | 6 +++---
> drivers/media/usb/hdpvr/hdpvr-i2c.c | 2 +-
> drivers/media/v4l2-core/v4l2-common.c | 4 ++--
> 25 files changed, 68 insertions(+), 70 deletions(-)
all good
Acked-by: Nikola Pajkovsky <npajkovs@redhat.com>
--
Nikola
^ permalink raw reply [flat|nested] 28+ messages in thread