aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorPeter Senna Tschudin <peter.senna@gmail.com>2013-01-24 17:29:12 -0500
committerMauro Carvalho Chehab <mchehab@redhat.com>2013-02-05 11:54:40 -0500
commite32d6eb865bbb693b1612a0fbf2ceeb6b51e208c (patch)
tree799fb1e86f6b09434e8ce0cc931d93ddd245ef71 /drivers
parentf8d2687963d789b78d86cfecff54604f447aa3a2 (diff)
[media] usb/gspca/xirlink_cit.c: use IS_ENABLED() macro
replace: #if defined(CONFIG_INPUT) || \ defined(CONFIG_INPUT_MODULE) with: #if IS_ENABLED(CONFIG_INPUT) This change was made for: CONFIG_INPUT Reported-by: Mauro Carvalho Chehab <mchehab@redhat.com> Signed-off-by: Peter Senna Tschudin <peter.senna@gmail.com> Signed-off-by: Hans de Goede <hdegoede@redhat.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/media/usb/gspca/xirlink_cit.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/media/usb/gspca/xirlink_cit.c b/drivers/media/usb/gspca/xirlink_cit.c
index d4b23c9bf90c..7eaf64eb867c 100644
--- a/drivers/media/usb/gspca/xirlink_cit.c
+++ b/drivers/media/usb/gspca/xirlink_cit.c
@@ -2759,7 +2759,7 @@ static void sd_stop0(struct gspca_dev *gspca_dev)
2759 break; 2759 break;
2760 } 2760 }
2761 2761
2762#if defined(CONFIG_INPUT) || defined(CONFIG_INPUT_MODULE) 2762#if IS_ENABLED(CONFIG_INPUT)
2763 /* If the last button state is pressed, release it now! */ 2763 /* If the last button state is pressed, release it now! */
2764 if (sd->button_state) { 2764 if (sd->button_state) {
2765 input_report_key(gspca_dev->input_dev, KEY_CAMERA, 0); 2765 input_report_key(gspca_dev->input_dev, KEY_CAMERA, 0);
@@ -2914,7 +2914,7 @@ static void sd_pkt_scan(struct gspca_dev *gspca_dev,
2914 gspca_frame_add(gspca_dev, INTER_PACKET, data, len); 2914 gspca_frame_add(gspca_dev, INTER_PACKET, data, len);
2915} 2915}
2916 2916
2917#if defined(CONFIG_INPUT) || defined(CONFIG_INPUT_MODULE) 2917#if IS_ENABLED(CONFIG_INPUT)
2918static void cit_check_button(struct gspca_dev *gspca_dev) 2918static void cit_check_button(struct gspca_dev *gspca_dev)
2919{ 2919{
2920 int new_button_state; 2920 int new_button_state;
@@ -3062,7 +3062,7 @@ static const struct sd_desc sd_desc = {
3062 .stopN = sd_stopN, 3062 .stopN = sd_stopN,
3063 .stop0 = sd_stop0, 3063 .stop0 = sd_stop0,
3064 .pkt_scan = sd_pkt_scan, 3064 .pkt_scan = sd_pkt_scan,
3065#if defined(CONFIG_INPUT) || defined(CONFIG_INPUT_MODULE) 3065#if IS_ENABLED(CONFIG_INPUT)
3066 .dq_callback = cit_check_button, 3066 .dq_callback = cit_check_button,
3067 .other_input = 1, 3067 .other_input = 1,
3068#endif 3068#endif
@@ -3079,7 +3079,7 @@ static const struct sd_desc sd_desc_isoc_nego = {
3079 .stopN = sd_stopN, 3079 .stopN = sd_stopN,
3080 .stop0 = sd_stop0, 3080 .stop0 = sd_stop0,
3081 .pkt_scan = sd_pkt_scan, 3081 .pkt_scan = sd_pkt_scan,
3082#if defined(CONFIG_INPUT) || defined(CONFIG_INPUT_MODULE) 3082#if IS_ENABLED(CONFIG_INPUT)
3083 .dq_callback = cit_check_button, 3083 .dq_callback = cit_check_button,
3084 .other_input = 1, 3084 .other_input = 1,
3085#endif 3085#endif