From: Peter Senna Tschudin <peter.senna@gmail.com>
To: mchehab@redhat.com
Cc: schulz@macnetix.de, dhowells@redhat.com, peter.senna@gmail.com,
mkrufky@linuxtv.org, linux-media@vger.kernel.org,
kernel-janitors@vger.kernel.org
Subject: [PATCH V2 03/24] pci/ttpci/av7110.c: use IS_ENABLED() macro
Date: Sat, 19 Jan 2013 21:41:10 -0200 [thread overview]
Message-ID: <1358638891-4775-4-git-send-email-peter.senna@gmail.com> (raw)
In-Reply-To: <1358638891-4775-1-git-send-email-peter.senna@gmail.com>
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
next prev parent reply other threads:[~2013-01-19 23:42 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
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 [this message]
2013-01-19 23:41 ` [PATCH V2 04/24] platform/marvell-ccic/mcam-core.h: " Peter Senna Tschudin
2013-01-19 23:41 ` [PATCH V2 05/24] radio/si470x/radio-si470x.h: " 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
2013-01-19 23:41 ` [PATCH V2 07/24] usb/gspca: " Peter Senna Tschudin
2013-01-19 23:41 ` [PATCH V2 08/24] usb/gspca/konica.c: " Peter Senna Tschudin
2013-01-19 23:41 ` [PATCH V2 09/24] usb/gspca/ov519.c: " Peter Senna Tschudin
2013-01-19 23:41 ` [PATCH V2 10/24] usb/gspca/pac207.c: " Peter Senna Tschudin
2013-01-19 23:41 ` [PATCH V2 11/24] gspca/pac7302.c: " Peter Senna Tschudin
2013-01-19 23:41 ` [PATCH V2 12/24] usb/gspca/pac7311.c: " Peter Senna Tschudin
2013-01-19 23:41 ` [PATCH V2 13/24] usb/gspca/se401.c: " Peter Senna Tschudin
2013-01-19 23:41 ` [PATCH V2 14/24] usb/gspca/sn9c20x.c: " Peter Senna Tschudin
2013-01-19 23:41 ` [PATCH V2 15/24] usb/gspca/sonixb.c: " Peter Senna Tschudin
2013-01-19 23:41 ` [PATCH V2 16/24] usb/gspca/sonixj.c: " Peter Senna Tschudin
2013-01-19 23:41 ` [PATCH V2 17/24] usb/gspca/spca561.c: " Peter Senna Tschudin
2013-01-19 23:41 ` [PATCH V2 18/24] usb/gspca/stv06xx/stv06xx.c: " Peter Senna Tschudin
2013-01-19 23:41 ` [PATCH V2 19/24] usb/gspca/t613.c: " Peter Senna Tschudin
2013-01-19 23:41 ` [PATCH V2 20/24] usb/gspca/xirlink_cit.c: " Peter Senna Tschudin
2013-01-19 23:41 ` [PATCH V2 21/24] usb/gspca/zc3xx.c: " Peter Senna Tschudin
2013-01-19 23:41 ` [PATCH V2 22/24] usb/hdpvr/hdpvr-core.c: " Peter Senna Tschudin
2013-01-19 23:41 ` [PATCH V2 23/24] usb/hdpvr/hdpvr-i2c.c: " Peter Senna Tschudin
2013-01-19 23:41 ` [PATCH V2 24/24] v4l2-core/v4l2-common.c: " Peter Senna Tschudin
2013-01-21 9:39 ` Hans Verkuil
2013-01-20 1:33 ` [PATCH V2 00/24] [media] " Nikola Pajkovsky
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1358638891-4775-4-git-send-email-peter.senna@gmail.com \
--to=peter.senna@gmail.com \
--cc=dhowells@redhat.com \
--cc=kernel-janitors@vger.kernel.org \
--cc=linux-media@vger.kernel.org \
--cc=mchehab@redhat.com \
--cc=mkrufky@linuxtv.org \
--cc=schulz@macnetix.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).