aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/usb/gspca
diff options
context:
space:
mode:
authorPeter Senna Tschudin <peter.senna@gmail.com>2013-01-24 17:29:11 -0500
committerMauro Carvalho Chehab <mchehab@redhat.com>2013-02-05 11:54:37 -0500
commitf8d2687963d789b78d86cfecff54604f447aa3a2 (patch)
treeb46b3ff32c5afdebf8d3a79555d3469e37ff4858 /drivers/media/usb/gspca
parent00ddb70702275aabcc7f9f999adaf8bc81756b54 (diff)
[media] usb/gspca/t613.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/usb/gspca')
-rw-r--r--drivers/media/usb/gspca/t613.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/media/usb/gspca/t613.c b/drivers/media/usb/gspca/t613.c
index b92d4ef2de6e..e2cc4e5a0ccb 100644
--- a/drivers/media/usb/gspca/t613.c
+++ b/drivers/media/usb/gspca/t613.c
@@ -823,7 +823,7 @@ static void sd_stopN(struct gspca_dev *gspca_dev)
823 msleep(20); 823 msleep(20);
824 reg_w(gspca_dev, 0x0309); 824 reg_w(gspca_dev, 0x0309);
825 } 825 }
826#if defined(CONFIG_INPUT) || defined(CONFIG_INPUT_MODULE) 826#if IS_ENABLED(CONFIG_INPUT)
827 /* If the last button state is pressed, release it now! */ 827 /* If the last button state is pressed, release it now! */
828 if (sd->button_pressed) { 828 if (sd->button_pressed) {
829 input_report_key(gspca_dev->input_dev, KEY_CAMERA, 0); 829 input_report_key(gspca_dev->input_dev, KEY_CAMERA, 0);
@@ -841,7 +841,7 @@ static void sd_pkt_scan(struct gspca_dev *gspca_dev,
841 int pkt_type; 841 int pkt_type;
842 842
843 if (data[0] == 0x5a) { 843 if (data[0] == 0x5a) {
844#if defined(CONFIG_INPUT) || defined(CONFIG_INPUT_MODULE) 844#if IS_ENABLED(CONFIG_INPUT)
845 if (len > 20) { 845 if (len > 20) {
846 u8 state = (data[20] & 0x80) ? 1 : 0; 846 u8 state = (data[20] & 0x80) ? 1 : 0;
847 if (sd->button_pressed != state) { 847 if (sd->button_pressed != state) {
@@ -1019,7 +1019,7 @@ static const struct sd_desc sd_desc = {
1019 .start = sd_start, 1019 .start = sd_start,
1020 .stopN = sd_stopN, 1020 .stopN = sd_stopN,
1021 .pkt_scan = sd_pkt_scan, 1021 .pkt_scan = sd_pkt_scan,
1022#if defined(CONFIG_INPUT) || defined(CONFIG_INPUT_MODULE) 1022#if IS_ENABLED(CONFIG_INPUT)
1023 .other_input = 1, 1023 .other_input = 1,
1024#endif 1024#endif
1025}; 1025};