linux-media.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Peter Senna Tschudin <peter.senna@gmail.com>
To: mchehab@redhat.com
Cc: hans.verkuil@cisco.com, sakari.ailus@iki.fi, dhowells@redhat.com,
	linux-media@vger.kernel.org, kernel-janitors@vger.kernel.org,
	Peter Senna Tschudin <peter.senna@gmail.com>
Subject: [PATCH 24/24] use IS_ENABLED() macro
Date: Sat, 19 Jan 2013 14:33:26 -0200	[thread overview]
Message-ID: <1358613206-4274-23-git-send-email-peter.senna@gmail.com> (raw)
In-Reply-To: <1358613206-4274-1-git-send-email-peter.senna@gmail.com>

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:

with:

Reported-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Signed-off-by: Peter Senna Tschudin <peter.senna@gmail.com>
---
 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


  parent reply	other threads:[~2013-01-19 16:35 UTC|newest]

Thread overview: 30+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-01-19 16:33 [PATCH 01/24] use IS_ENABLED() macro Peter Senna Tschudin
2013-01-19 16:33 ` [PATCH 02/24] " 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 ` Peter Senna Tschudin [this message]
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-23-git-send-email-peter.senna@gmail.com \
    --to=peter.senna@gmail.com \
    --cc=dhowells@redhat.com \
    --cc=hans.verkuil@cisco.com \
    --cc=kernel-janitors@vger.kernel.org \
    --cc=linux-media@vger.kernel.org \
    --cc=mchehab@redhat.com \
    --cc=sakari.ailus@iki.fi \
    /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).