diff options
author | Peter Senna Tschudin <peter.senna@gmail.com> | 2013-01-24 17:29:00 -0500 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2013-02-05 11:53:48 -0500 |
commit | 9bc044633161e23f3f2c590bc572df8eb722f94b (patch) | |
tree | c7c6c88617dd615f5caca44c9079fba8df0045e0 /drivers/media | |
parent | 13a00fabe44874db9e693d3c2761e9b6fa344be2 (diff) |
[media] usb/gspca/konica.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/media')
-rw-r--r-- | drivers/media/usb/gspca/konica.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/media/usb/gspca/konica.c b/drivers/media/usb/gspca/konica.c index bbf91e07e38b..61e25dbf2447 100644 --- a/drivers/media/usb/gspca/konica.c +++ b/drivers/media/usb/gspca/konica.c | |||
@@ -246,7 +246,7 @@ static void sd_stopN(struct gspca_dev *gspca_dev) | |||
246 | struct sd *sd = (struct sd *) gspca_dev; | 246 | struct sd *sd = (struct sd *) gspca_dev; |
247 | 247 | ||
248 | konica_stream_off(gspca_dev); | 248 | konica_stream_off(gspca_dev); |
249 | #if defined(CONFIG_INPUT) || defined(CONFIG_INPUT_MODULE) | 249 | #if IS_ENABLED(CONFIG_INPUT) |
250 | /* Don't keep the button in the pressed state "forever" if it was | 250 | /* Don't keep the button in the pressed state "forever" if it was |
251 | pressed when streaming is stopped */ | 251 | pressed when streaming is stopped */ |
252 | if (sd->snapshot_pressed) { | 252 | if (sd->snapshot_pressed) { |
@@ -345,7 +345,7 @@ static void sd_isoc_irq(struct urb *urb) | |||
345 | gspca_frame_add(gspca_dev, LAST_PACKET, NULL, 0); | 345 | gspca_frame_add(gspca_dev, LAST_PACKET, NULL, 0); |
346 | gspca_frame_add(gspca_dev, FIRST_PACKET, NULL, 0); | 346 | gspca_frame_add(gspca_dev, FIRST_PACKET, NULL, 0); |
347 | } else { | 347 | } else { |
348 | #if defined(CONFIG_INPUT) || defined(CONFIG_INPUT_MODULE) | 348 | #if IS_ENABLED(CONFIG_INPUT) |
349 | u8 button_state = st & 0x40 ? 1 : 0; | 349 | u8 button_state = st & 0x40 ? 1 : 0; |
350 | if (sd->snapshot_pressed != button_state) { | 350 | if (sd->snapshot_pressed != button_state) { |
351 | input_report_key(gspca_dev->input_dev, | 351 | input_report_key(gspca_dev->input_dev, |
@@ -452,7 +452,7 @@ static const struct sd_desc sd_desc = { | |||
452 | .init_controls = sd_init_controls, | 452 | .init_controls = sd_init_controls, |
453 | .start = sd_start, | 453 | .start = sd_start, |
454 | .stopN = sd_stopN, | 454 | .stopN = sd_stopN, |
455 | #if defined(CONFIG_INPUT) || defined(CONFIG_INPUT_MODULE) | 455 | #if IS_ENABLED(CONFIG_INPUT) |
456 | .other_input = 1, | 456 | .other_input = 1, |
457 | #endif | 457 | #endif |
458 | }; | 458 | }; |