diff options
author | Peter Senna Tschudin <peter.senna@gmail.com> | 2013-01-19 17:41:29 -0500 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2013-02-06 06:20:24 -0500 |
commit | 9ecf9b085a0926e07c78c08a07296bbfd1c37d07 (patch) | |
tree | 62bb33ce0c44a4eceada6d0d57f97e5e528edf19 /drivers | |
parent | f1c16adce0d2a14376dcafd00c90a88c885b4fed (diff) |
[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')
-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, | |||
391 | goto error; | 391 | goto error; |
392 | } | 392 | } |
393 | 393 | ||
394 | #if defined(CONFIG_I2C) || defined(CONFIG_I2C_MODULE) | 394 | #if IS_ENABLED(CONFIG_I2C) |
395 | retval = hdpvr_register_i2c_adapter(dev); | 395 | retval = hdpvr_register_i2c_adapter(dev); |
396 | if (retval < 0) { | 396 | if (retval < 0) { |
397 | v4l2_err(&dev->v4l2_dev, "i2c adapter register failed\n"); | 397 | v4l2_err(&dev->v4l2_dev, "i2c adapter register failed\n"); |
@@ -419,7 +419,7 @@ static int hdpvr_probe(struct usb_interface *interface, | |||
419 | return 0; | 419 | return 0; |
420 | 420 | ||
421 | reg_fail: | 421 | reg_fail: |
422 | #if defined(CONFIG_I2C) || defined(CONFIG_I2C_MODULE) | 422 | #if IS_ENABLED(CONFIG_I2C) |
423 | i2c_del_adapter(&dev->i2c_adapter); | 423 | i2c_del_adapter(&dev->i2c_adapter); |
424 | #endif | 424 | #endif |
425 | error: | 425 | error: |
@@ -451,7 +451,7 @@ static void hdpvr_disconnect(struct usb_interface *interface) | |||
451 | mutex_lock(&dev->io_mutex); | 451 | mutex_lock(&dev->io_mutex); |
452 | hdpvr_cancel_queue(dev); | 452 | hdpvr_cancel_queue(dev); |
453 | mutex_unlock(&dev->io_mutex); | 453 | mutex_unlock(&dev->io_mutex); |
454 | #if defined(CONFIG_I2C) || defined(CONFIG_I2C_MODULE) | 454 | #if IS_ENABLED(CONFIG_I2C) |
455 | i2c_del_adapter(&dev->i2c_adapter); | 455 | i2c_del_adapter(&dev->i2c_adapter); |
456 | #endif | 456 | #endif |
457 | video_unregister_device(dev->video_dev); | 457 | video_unregister_device(dev->video_dev); |