소스 검색

[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>
Peter Senna Tschudin 12 년 전
부모
커밋
9ecf9b085a
1개의 변경된 파일3개의 추가작업 그리고 3개의 파일을 삭제
  1. 3 3
      drivers/media/usb/hdpvr/hdpvr-core.c

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

@@ -391,7 +391,7 @@ static int hdpvr_probe(struct usb_interface *interface,
 		goto error;
 		goto error;
 	}
 	}
 
 
-#if defined(CONFIG_I2C) || defined(CONFIG_I2C_MODULE)
+#if IS_ENABLED(CONFIG_I2C)
 	retval = hdpvr_register_i2c_adapter(dev);
 	retval = hdpvr_register_i2c_adapter(dev);
 	if (retval < 0) {
 	if (retval < 0) {
 		v4l2_err(&dev->v4l2_dev, "i2c adapter register failed\n");
 		v4l2_err(&dev->v4l2_dev, "i2c adapter register failed\n");
@@ -419,7 +419,7 @@ static int hdpvr_probe(struct usb_interface *interface,
 	return 0;
 	return 0;
 
 
 reg_fail:
 reg_fail:
-#if defined(CONFIG_I2C) || defined(CONFIG_I2C_MODULE)
+#if IS_ENABLED(CONFIG_I2C)
 	i2c_del_adapter(&dev->i2c_adapter);
 	i2c_del_adapter(&dev->i2c_adapter);
 #endif
 #endif
 error:
 error:
@@ -451,7 +451,7 @@ static void hdpvr_disconnect(struct usb_interface *interface)
 	mutex_lock(&dev->io_mutex);
 	mutex_lock(&dev->io_mutex);
 	hdpvr_cancel_queue(dev);
 	hdpvr_cancel_queue(dev);
 	mutex_unlock(&dev->io_mutex);
 	mutex_unlock(&dev->io_mutex);
-#if defined(CONFIG_I2C) || defined(CONFIG_I2C_MODULE)
+#if IS_ENABLED(CONFIG_I2C)
 	i2c_del_adapter(&dev->i2c_adapter);
 	i2c_del_adapter(&dev->i2c_adapter);
 #endif
 #endif
 	video_unregister_device(dev->video_dev);
 	video_unregister_device(dev->video_dev);