Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e32d6eb8 authored by Peter Senna Tschudin's avatar Peter Senna Tschudin Committed by Mauro Carvalho Chehab
Browse files

[media] usb/gspca/xirlink_cit.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: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
Signed-off-by: default avatarPeter Senna Tschudin <peter.senna@gmail.com>
Signed-off-by: default avatarHans de Goede <hdegoede@redhat.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent f8d26879

drivers/media/usb/gspca/xirlink_cit.c

+4 −4
Original line number Original line Diff line number Diff line
@@ -2759,7 +2759,7 @@ static void sd_stop0(struct gspca_dev *gspca_dev) 
		break;

		break;

	}

	}





#if defined(CONFIG_INPUT) || defined(CONFIG_INPUT_MODULE)

#if IS_ENABLED(CONFIG_INPUT)

	/* If the last button state is pressed, release it now! */

	/* If the last button state is pressed, release it now! */

	if (sd->button_state) {

	if (sd->button_state) {

		input_report_key(gspca_dev->input_dev, KEY_CAMERA, 0);

		input_report_key(gspca_dev->input_dev, KEY_CAMERA, 0);
@@ -2914,7 +2914,7 @@ static void sd_pkt_scan(struct gspca_dev *gspca_dev, 
	gspca_frame_add(gspca_dev, INTER_PACKET, data, len);

	gspca_frame_add(gspca_dev, INTER_PACKET, data, len);

}

}





#if defined(CONFIG_INPUT) || defined(CONFIG_INPUT_MODULE)

#if IS_ENABLED(CONFIG_INPUT)

static void cit_check_button(struct gspca_dev *gspca_dev)

static void cit_check_button(struct gspca_dev *gspca_dev)

{

{

	int new_button_state;

	int new_button_state;
@@ -3062,7 +3062,7 @@ static const struct sd_desc sd_desc = { 
	.stopN = sd_stopN,

	.stopN = sd_stopN,

	.stop0 = sd_stop0,

	.stop0 = sd_stop0,

	.pkt_scan = sd_pkt_scan,

	.pkt_scan = sd_pkt_scan,

#if defined(CONFIG_INPUT) || defined(CONFIG_INPUT_MODULE)

#if IS_ENABLED(CONFIG_INPUT)

	.dq_callback = cit_check_button,

	.dq_callback = cit_check_button,

	.other_input = 1,

	.other_input = 1,

#endif

#endif
@@ -3079,7 +3079,7 @@ static const struct sd_desc sd_desc_isoc_nego = { 
	.stopN = sd_stopN,

	.stopN = sd_stopN,

	.stop0 = sd_stop0,

	.stop0 = sd_stop0,

	.pkt_scan = sd_pkt_scan,

	.pkt_scan = sd_pkt_scan,

#if defined(CONFIG_INPUT) || defined(CONFIG_INPUT_MODULE)

#if IS_ENABLED(CONFIG_INPUT)

	.dq_callback = cit_check_button,

	.dq_callback = cit_check_button,

	.other_input = 1,

	.other_input = 1,

#endif

#endif