Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9ecf9b08 authored by Peter Senna Tschudin's avatar Peter Senna Tschudin Committed by Mauro Carvalho Chehab
Browse files

[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: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
Signed-off-by: default avatarPeter Senna Tschudin <peter.senna@gmail.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent f1c16adc

drivers/media/usb/hdpvr/hdpvr-core.c

+3 −3
Original line number Diff line number Diff line
@@ -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);