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

Commit 381d7f79 authored by Zheng Di's avatar Zheng Di Committed by Mauro Carvalho Chehab
Browse files

[media] staging: media: lirc_parallel.c: fix coding style 



This patch fix checkpatch:
WARNING: else is not generally useful after a break or return
WARNING: line over 80 characters

[m.chehab@samsung.com: Fix conflicts and use a better coding style for
 passing the parameters to parport_register_device()]
Signed-off-by: default avatarZheng Di <zhengdi05@gmail.com>

Signed-off-by: default avatarMauro Carvalho Chehab <m.chehab@samsung.com>
parent ad86faad

drivers/staging/media/lirc/lirc_parallel.c

+16 −16
Original line number Diff line number Diff line
@@ -169,7 +169,7 @@ static unsigned int init_lirc_timer(void) 
			newtimer = (1000000*count)/timeelapsed;

			pr_info("%u Hz timer detected\n", newtimer);

			return newtimer;

		}  else {

		}

		newtimer = (1000000*count)/timeelapsed;

		if (abs(newtimer - default_timer) > default_timer/10) {

			/* bad timer */
@@ -182,11 +182,10 @@ static unsigned int init_lirc_timer(void) 
			return newtimer; /* use detected value */

		}

	}

	} else {



	pr_notice("no timer detected\n");

	return 0;

}

}



static int lirc_claim(void)

{
@@ -661,7 +660,8 @@ static int __init lirc_parallel_init(void) 
		goto exit_device_put;

	}

	ppdevice = parport_register_device(pport, LIRC_DRIVER_NAME,

					   pf, kf, lirc_lirc_irq_handler, 0, NULL);

					   pf, kf, lirc_lirc_irq_handler, 0,

					   NULL);

	parport_put_port(pport);

	if (ppdevice == NULL) {

		pr_notice("parport_register_device() failed\n");