From: Peter Senna Tschudin <peter.senna@gmail.com>
To: mchehab@redhat.com
Cc: hans.verkuil@cisco.com, jrnieder@gmail.com,
peter.senna@gmail.com, emilgoode@gmail.com,
linux-media@vger.kernel.org, kernel-janitors@vger.kernel.org
Subject: [PATCH 01/24] use IS_ENABLED() macro
Date: Sat, 19 Jan 2013 14:33:04 -0200 [thread overview]
Message-ID: <1358613206-4274-1-git-send-email-peter.senna@gmail.com> (raw)
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>
---
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
next reply other threads:[~2013-01-19 16:33 UTC|newest]
Thread overview: 30+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-01-19 16:33 Peter Senna Tschudin [this message]
2013-01-19 16:33 ` [PATCH 02/24] use IS_ENABLED() macro Peter Senna Tschudin
2013-01-19 16:33 ` [PATCH 03/24] " Peter Senna Tschudin
2013-01-19 16:33 ` [PATCH 04/24] " Peter Senna Tschudin
2013-01-22 14:20 ` Jonathan Corbet
2013-01-19 16:33 ` [PATCH 05/24] " Peter Senna Tschudin
2013-01-19 16:33 ` [PATCH 06/24] " Peter Senna Tschudin
2013-01-19 16:33 ` [PATCH 07/24] " Peter Senna Tschudin
2013-01-19 16:33 ` [PATCH 08/24] " Peter Senna Tschudin
2013-01-19 16:33 ` [PATCH 09/24] " Peter Senna Tschudin
2013-01-19 16:33 ` [PATCH 10/24] " Peter Senna Tschudin
2013-01-19 16:33 ` [PATCH 11/24] " Peter Senna Tschudin
2013-01-19 16:33 ` [PATCH 12/24] " Peter Senna Tschudin
2013-01-19 16:33 ` [PATCH 13/24] " Peter Senna Tschudin
2013-01-19 16:33 ` [PATCH 14/24] " Peter Senna Tschudin
2013-01-19 16:33 ` [PATCH 16/24] " Peter Senna Tschudin
2013-01-19 16:33 ` [PATCH 17/24] " Peter Senna Tschudin
2013-01-19 16:33 ` [PATCH 18/24] " Peter Senna Tschudin
2013-01-19 16:33 ` [PATCH 19/24] " Peter Senna Tschudin
2013-01-19 16:33 ` [PATCH 20/24] " Peter Senna Tschudin
2013-01-19 16:33 ` [PATCH 21/24] " Peter Senna Tschudin
2013-01-19 16:33 ` [PATCH 22/24] " Peter Senna Tschudin
2013-01-19 16:33 ` [PATCH 23/24] " Peter Senna Tschudin
2013-01-19 16:33 ` [PATCH 24/24] " Peter Senna Tschudin
2013-01-19 17:49 ` [PATCH 01/24] " Nikola Pajkovsky
2013-01-21 12:47 ` Hans de Goede
2013-01-21 12:51 ` Peter Senna Tschudin
2013-01-22 9:52 ` Hans de Goede
2013-01-24 20:45 ` Mauro Carvalho Chehab
2013-01-21 22:24 ` Jonathan Nieder
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=1358613206-4274-1-git-send-email-peter.senna@gmail.com \
--to=peter.senna@gmail.com \
--cc=emilgoode@gmail.com \
--cc=hans.verkuil@cisco.com \
--cc=jrnieder@gmail.com \
--cc=kernel-janitors@vger.kernel.org \
--cc=linux-media@vger.kernel.org \
--cc=mchehab@redhat.com \
/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).