From: Peter Senna Tschudin <peter.senna@gmail.com>
To: mchehab@redhat.com
Cc: jarod@redhat.com, tralph@mythtv.org, peter.senna@gmail.com,
gregkh@linuxfoundation.org, linux-media@vger.kernel.org,
kernel-janitors@vger.kernel.org
Subject: [PATCH 22/24] use IS_ENABLED() macro
Date: Sat, 19 Jan 2013 14:33:24 -0200 [thread overview]
Message-ID: <1358613206-4274-21-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_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>
---
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
next prev parent reply other threads:[~2013-01-19 16:34 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 ` Peter Senna Tschudin [this message]
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-21-git-send-email-peter.senna@gmail.com \
--to=peter.senna@gmail.com \
--cc=gregkh@linuxfoundation.org \
--cc=jarod@redhat.com \
--cc=kernel-janitors@vger.kernel.org \
--cc=linux-media@vger.kernel.org \
--cc=mchehab@redhat.com \
--cc=tralph@mythtv.org \
/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).