Skip to content

Commit

Permalink
[media] [V2,22/24] usb/hdpvr/hdpvr-core.c: use IS_ENABLED() macro
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Peter Senna Tschudin authored and Mauro Carvalho Chehab committed Feb 6, 2013
1 parent f1c16ad commit 9ecf9b0
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions drivers/media/usb/hdpvr/hdpvr-core.c
Original file line number Diff line number Diff line change
Expand Up @@ -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");
Expand Down Expand Up @@ -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:
Expand Down Expand Up @@ -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);
Expand Down

0 comments on commit 9ecf9b0

Please sign in to comment.