* [PATCH 2/3] pci/ttpci/av7110.c: use IS_ENABLED() macro
2013-01-09 12:32 [PATCH 1/3] pci/cx88: use IS_ENABLED() macro Peter Senna Tschudin
@ 2013-01-09 12:32 ` Peter Senna Tschudin
2013-01-09 12:32 ` [PATCH 3/3] pci/saa7134: " Peter Senna Tschudin
2013-01-09 12:49 ` [PATCH 1/3] pci/cx88: " Hans Verkuil
2 siblings, 0 replies; 4+ messages in thread
From: Peter Senna Tschudin @ 2013-01-09 12:32 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>
---
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] 4+ messages in thread* [PATCH 3/3] pci/saa7134: use IS_ENABLED() macro
2013-01-09 12:32 [PATCH 1/3] pci/cx88: use IS_ENABLED() macro Peter Senna Tschudin
2013-01-09 12:32 ` [PATCH 2/3] pci/ttpci/av7110.c: " Peter Senna Tschudin
@ 2013-01-09 12:32 ` Peter Senna Tschudin
2013-01-09 12:49 ` [PATCH 1/3] pci/cx88: " Hans Verkuil
2 siblings, 0 replies; 4+ messages in thread
From: Peter Senna Tschudin @ 2013-01-09 12:32 UTC (permalink / raw)
To: mchehab
Cc: remi.schwartz, sean, kyle, simon.farnsworth, linux-media,
kernel-janitors, Peter Senna Tschudin
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_SAA7134_DVB
Reported-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Signed-off-by: Peter Senna Tschudin <peter.senna@gmail.com>
---
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] 4+ messages in thread* Re: [PATCH 1/3] pci/cx88: use IS_ENABLED() macro
2013-01-09 12:32 [PATCH 1/3] pci/cx88: use IS_ENABLED() macro Peter Senna Tschudin
2013-01-09 12:32 ` [PATCH 2/3] pci/ttpci/av7110.c: " Peter Senna Tschudin
2013-01-09 12:32 ` [PATCH 3/3] pci/saa7134: " Peter Senna Tschudin
@ 2013-01-09 12:49 ` Hans Verkuil
2 siblings, 0 replies; 4+ messages in thread
From: Hans Verkuil @ 2013-01-09 12:49 UTC (permalink / raw)
To: Peter Senna Tschudin
Cc: mchehab, hans.verkuil, jrnieder, emilgoode, linux-media,
kernel-janitors
On Wed 9 January 2013 13:32:12 Peter Senna Tschudin wrote:
> 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>
Acked-by: Hans Verkuil <hans.verkuil@cisco.com>
Regards,
Hans
> ---
> 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
>
^ permalink raw reply [flat|nested] 4+ messages in thread