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

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

[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: 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 00ddb707

drivers/media/usb/gspca/t613.c

+3 −3
Original line number Original line Diff line number Diff line
@@ -823,7 +823,7 @@ static void sd_stopN(struct gspca_dev *gspca_dev) 
		msleep(20);

		msleep(20);

		reg_w(gspca_dev, 0x0309);

		reg_w(gspca_dev, 0x0309);

	}

	}

#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_pressed) {

	if (sd->button_pressed) {

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

		input_report_key(gspca_dev->input_dev, KEY_CAMERA, 0);
@@ -841,7 +841,7 @@ static void sd_pkt_scan(struct gspca_dev *gspca_dev, 
	int pkt_type;

	int pkt_type;





	if (data[0] == 0x5a) {

	if (data[0] == 0x5a) {

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

#if IS_ENABLED(CONFIG_INPUT)

		if (len > 20) {

		if (len > 20) {

			u8 state = (data[20] & 0x80) ? 1 : 0;

			u8 state = (data[20] & 0x80) ? 1 : 0;

			if (sd->button_pressed != state) {

			if (sd->button_pressed != state) {
@@ -1019,7 +1019,7 @@ static const struct sd_desc sd_desc = { 
	.start = sd_start,

	.start = sd_start,

	.stopN = sd_stopN,

	.stopN = sd_stopN,

	.pkt_scan = sd_pkt_scan,

	.pkt_scan = sd_pkt_scan,

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

#if IS_ENABLED(CONFIG_INPUT)

	.other_input = 1,

	.other_input = 1,

#endif

#endif

};

};