|
@@ -246,7 +246,7 @@ static void sd_stopN(struct gspca_dev *gspca_dev)
|
|
|
struct sd *sd = (struct sd *) gspca_dev;
|
|
|
|
|
|
konica_stream_off(gspca_dev);
|
|
|
-#if defined(CONFIG_INPUT) || defined(CONFIG_INPUT_MODULE)
|
|
|
+#if IS_ENABLED(CONFIG_INPUT)
|
|
|
/* Don't keep the button in the pressed state "forever" if it was
|
|
|
pressed when streaming is stopped */
|
|
|
if (sd->snapshot_pressed) {
|
|
@@ -345,7 +345,7 @@ static void sd_isoc_irq(struct urb *urb)
|
|
|
gspca_frame_add(gspca_dev, LAST_PACKET, NULL, 0);
|
|
|
gspca_frame_add(gspca_dev, FIRST_PACKET, NULL, 0);
|
|
|
} else {
|
|
|
-#if defined(CONFIG_INPUT) || defined(CONFIG_INPUT_MODULE)
|
|
|
+#if IS_ENABLED(CONFIG_INPUT)
|
|
|
u8 button_state = st & 0x40 ? 1 : 0;
|
|
|
if (sd->snapshot_pressed != button_state) {
|
|
|
input_report_key(gspca_dev->input_dev,
|
|
@@ -452,7 +452,7 @@ static const struct sd_desc sd_desc = {
|
|
|
.init_controls = sd_init_controls,
|
|
|
.start = sd_start,
|
|
|
.stopN = sd_stopN,
|
|
|
-#if defined(CONFIG_INPUT) || defined(CONFIG_INPUT_MODULE)
|
|
|
+#if IS_ENABLED(CONFIG_INPUT)
|
|
|
.other_input = 1,
|
|
|
#endif
|
|
|
};
|