Messages in this thread Patch in this message | | | Date | Sun, 06 Jul 2014 21:37:06 +0800 | From | vv <> | Subject | [PATCH]staging: media: lirc_parallel.c: fix coding style |
| |
From 9d2c680fb573985588d33e31379d50ef3fb6e2fd Mon Sep 17 00:00:00 2001 From: Zheng Di <zhengdi05@gmail.com> Date: Sun, 6 Jul 2014 20:41:53 +0800 Subject: [PATCH] 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
Signed-off-by: Zheng Di <zhengdi05@gmail.com> --- drivers/staging/media/lirc/lirc_parallel.c | 32 ++++++++++++++-------------- 1 file changed, 16 insertions(+), 16 deletions(-)
diff --git a/drivers/staging/media/lirc/lirc_parallel.c b/drivers/staging/media/lirc/lirc_parallel.c index 1394f02..d7eb2a4 100644 --- a/drivers/staging/media/lirc/lirc_parallel.c +++ b/drivers/staging/media/lirc/lirc_parallel.c @@ -169,23 +169,23 @@ 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 */ - pr_notice("bad timer: %u Hz\n", newtimer); - pr_notice("using default timer: %u Hz\n", - default_timer); - return default_timer; - } else { - pr_info("%u Hz timer detected\n", newtimer); - return newtimer; /* use detected value */ - } } - } else { - pr_notice("no timer detected\n"); - return 0; + + newtimer = (1000000*count)/timeelapsed; + if (abs(newtimer - default_timer) > default_timer/10) { + /* bad timer */ + pr_notice("bad timer: %u Hz\n", newtimer); + pr_notice("using default timer: %u Hz\n", + default_timer); + return default_timer; + } + + pr_info("%u Hz timer detected\n", newtimer); + return newtimer; /* use detected value */ } + + pr_notice("no timer detected\n"); + return 0; }
static int lirc_claim(void) @@ -661,7 +661,7 @@ 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"); -- 1.7.9.5
| |