diff options
author | Peter Senna Tschudin <peter.senna@gmail.com> | 2013-01-24 17:29:01 -0500 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2013-02-05 11:53:54 -0500 |
commit | c4ea799a2bbbc5623f405233382c36b1f3aa9684 (patch) | |
tree | e8104505384d414b4b2bee49e62e89be10249575 | |
parent | 9bc044633161e23f3f2c590bc572df8eb722f94b (diff) |
[media] usb/gspca/ov519.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>
-rw-r--r-- | drivers/media/usb/gspca/ov519.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/media/usb/gspca/ov519.c b/drivers/media/usb/gspca/ov519.c index 9aa09f845ce4..9ad19a7ef81b 100644 --- a/drivers/media/usb/gspca/ov519.c +++ b/drivers/media/usb/gspca/ov519.c | |||
@@ -4238,7 +4238,7 @@ static void sd_stop0(struct gspca_dev *gspca_dev) | |||
4238 | if (sd->bridge == BRIDGE_W9968CF) | 4238 | if (sd->bridge == BRIDGE_W9968CF) |
4239 | w9968cf_stop0(sd); | 4239 | w9968cf_stop0(sd); |
4240 | 4240 | ||
4241 | #if defined(CONFIG_INPUT) || defined(CONFIG_INPUT_MODULE) | 4241 | #if IS_ENABLED(CONFIG_INPUT) |
4242 | /* If the last button state is pressed, release it now! */ | 4242 | /* If the last button state is pressed, release it now! */ |
4243 | if (sd->snapshot_pressed) { | 4243 | if (sd->snapshot_pressed) { |
4244 | input_report_key(gspca_dev->input_dev, KEY_CAMERA, 0); | 4244 | input_report_key(gspca_dev->input_dev, KEY_CAMERA, 0); |
@@ -4255,7 +4255,7 @@ static void ov51x_handle_button(struct gspca_dev *gspca_dev, u8 state) | |||
4255 | struct sd *sd = (struct sd *) gspca_dev; | 4255 | struct sd *sd = (struct sd *) gspca_dev; |
4256 | 4256 | ||
4257 | if (sd->snapshot_pressed != state) { | 4257 | if (sd->snapshot_pressed != state) { |
4258 | #if defined(CONFIG_INPUT) || defined(CONFIG_INPUT_MODULE) | 4258 | #if IS_ENABLED(CONFIG_INPUT) |
4259 | input_report_key(gspca_dev->input_dev, KEY_CAMERA, state); | 4259 | input_report_key(gspca_dev->input_dev, KEY_CAMERA, state); |
4260 | input_sync(gspca_dev->input_dev); | 4260 | input_sync(gspca_dev->input_dev); |
4261 | #endif | 4261 | #endif |
@@ -4924,7 +4924,7 @@ static const struct sd_desc sd_desc = { | |||
4924 | .dq_callback = sd_reset_snapshot, | 4924 | .dq_callback = sd_reset_snapshot, |
4925 | .get_jcomp = sd_get_jcomp, | 4925 | .get_jcomp = sd_get_jcomp, |
4926 | .set_jcomp = sd_set_jcomp, | 4926 | .set_jcomp = sd_set_jcomp, |
4927 | #if defined(CONFIG_INPUT) || defined(CONFIG_INPUT_MODULE) | 4927 | #if IS_ENABLED(CONFIG_INPUT) |
4928 | .other_input = 1, | 4928 | .other_input = 1, |
4929 | #endif | 4929 | #endif |
4930 | }; | 4930 | }; |