diff options
author | Peter Senna Tschudin <peter.senna@gmail.com> | 2013-01-24 17:28:58 -0500 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2013-02-05 11:53:14 -0500 |
commit | a3f6ce6345771932f4d4ba080d3a5f0846293983 (patch) | |
tree | 910c353b74c638088c6d03ad4e2b958ef41331b4 | |
parent | 480d3ca13e64ab06200ab2c4dbff462c2ac7494d (diff) |
[media] usb/gspca/cpia1.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/cpia1.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/media/usb/gspca/cpia1.c b/drivers/media/usb/gspca/cpia1.c index b3ba47d4d6a2..1dcdd9f95f1c 100644 --- a/drivers/media/usb/gspca/cpia1.c +++ b/drivers/media/usb/gspca/cpia1.c | |||
@@ -541,7 +541,7 @@ static int do_command(struct gspca_dev *gspca_dev, u16 command, | |||
541 | /* test button press */ | 541 | /* test button press */ |
542 | a = ((gspca_dev->usb_buf[1] & 0x02) == 0); | 542 | a = ((gspca_dev->usb_buf[1] & 0x02) == 0); |
543 | if (a != sd->params.qx3.button) { | 543 | if (a != sd->params.qx3.button) { |
544 | #if defined(CONFIG_INPUT) || defined(CONFIG_INPUT_MODULE) | 544 | #if IS_ENABLED(CONFIG_INPUT) |
545 | input_report_key(gspca_dev->input_dev, KEY_CAMERA, a); | 545 | input_report_key(gspca_dev->input_dev, KEY_CAMERA, a); |
546 | input_sync(gspca_dev->input_dev); | 546 | input_sync(gspca_dev->input_dev); |
547 | #endif | 547 | #endif |
@@ -1640,7 +1640,7 @@ static void sd_stopN(struct gspca_dev *gspca_dev) | |||
1640 | /* Update the camera status */ | 1640 | /* Update the camera status */ |
1641 | do_command(gspca_dev, CPIA_COMMAND_GetCameraStatus, 0, 0, 0, 0); | 1641 | do_command(gspca_dev, CPIA_COMMAND_GetCameraStatus, 0, 0, 0, 0); |
1642 | 1642 | ||
1643 | #if defined(CONFIG_INPUT) || defined(CONFIG_INPUT_MODULE) | 1643 | #if IS_ENABLED(CONFIG_INPUT) |
1644 | /* If the last button state is pressed, release it now! */ | 1644 | /* If the last button state is pressed, release it now! */ |
1645 | if (sd->params.qx3.button) { | 1645 | if (sd->params.qx3.button) { |
1646 | /* The camera latch will hold the pressed state until we reset | 1646 | /* The camera latch will hold the pressed state until we reset |
@@ -1869,7 +1869,7 @@ static const struct sd_desc sd_desc = { | |||
1869 | .stopN = sd_stopN, | 1869 | .stopN = sd_stopN, |
1870 | .dq_callback = sd_dq_callback, | 1870 | .dq_callback = sd_dq_callback, |
1871 | .pkt_scan = sd_pkt_scan, | 1871 | .pkt_scan = sd_pkt_scan, |
1872 | #if defined(CONFIG_INPUT) || defined(CONFIG_INPUT_MODULE) | 1872 | #if IS_ENABLED(CONFIG_INPUT) |
1873 | .other_input = 1, | 1873 | .other_input = 1, |
1874 | #endif | 1874 | #endif |
1875 | }; | 1875 | }; |