diff options
| author | Peter Senna Tschudin <peter.senna@gmail.com> | 2013-01-20 02:41:29 +0400 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2013-02-06 15:20:24 +0400 |
| commit | 9ecf9b085a0926e07c78c08a07296bbfd1c37d07 (patch) | |
| tree | 62bb33ce0c44a4eceada6d0d57f97e5e528edf19 /drivers/media/usb/hdpvr | |
| parent | f1c16adce0d2a14376dcafd00c90a88c885b4fed (diff) | |
| download | linux-9ecf9b085a0926e07c78c08a07296bbfd1c37d07.tar.xz | |
[media] [V2,22/24] usb/hdpvr/hdpvr-core.c: use IS_ENABLED() macro
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>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/usb/hdpvr')
| -rw-r--r-- | drivers/media/usb/hdpvr/hdpvr-core.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/media/usb/hdpvr/hdpvr-core.c b/drivers/media/usb/hdpvr/hdpvr-core.c index 84dc26fe80ee..5c6193536399 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); |