From patchwork Sun Jul 6 13:37:06 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: vv X-Patchwork-Id: 4553941 Return-Path: X-Original-To: patchwork-linux-media@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 27CFEC0514 for ; Tue, 15 Jul 2014 14:18:13 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 3B3EF20155 for ; Tue, 15 Jul 2014 14:18:12 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 510A72011E for ; Tue, 15 Jul 2014 14:18:10 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751604AbaGOOSH (ORCPT ); Tue, 15 Jul 2014 10:18:07 -0400 Received: from mail-pa0-f47.google.com ([209.85.220.47]:50089 "EHLO mail-pa0-f47.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751317AbaGOOSG (ORCPT ); Tue, 15 Jul 2014 10:18:06 -0400 Received: by mail-pa0-f47.google.com with SMTP id kx10so6040583pab.20 for ; Tue, 15 Jul 2014 07:18:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=message-id:date:from:user-agent:mime-version:cc:subject :content-type:content-transfer-encoding; bh=AwVjUDjaRd0Do+3OeG9wRb+nwEycIWQnJVEJEsz9Amc=; b=NJM0hUdOdNVKrG+qH2qW1fsh6vaA2W5cSy7xAE/ZmNlZ+AZcSq/AhJKHDjN2fVGtuT OWFg3+lrKyc4E0h4oXMX3AtR0BoXqMvMDW15jLRSi7JNq2mnDPU0ZfalAkT8Yo5isBkl P1y5VsPSpoxbt5SHzWITJjS0+UemqztyuiOxKTuwShK5mRrfzwyKzyo/whSyKnLqGgOu u0mzTwPwhe9p2OHGjAdsGgGd8pc9RECn8H6C1mKKEdVTpXeeMwRZX+X7FVsBd1N54uVp 63KSCxZ81iZZVBfcONHvrqCm7CE6kXhmiOYNQr5HC9R+haomyCT2d5Asm+aDbNC2Mc7P FTYA== X-Received: by 10.68.138.227 with SMTP id qt3mr23551702pbb.6.1405433885563; Tue, 15 Jul 2014 07:18:05 -0700 (PDT) Received: from [192.168.1.107] ([122.235.234.89]) by mx.google.com with ESMTPSA id zn9sm58607133pac.31.2014.07.15.07.18.02 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 15 Jul 2014 07:18:04 -0700 (PDT) Message-ID: <53B95102.3030001@gmail.com> Date: Sun, 06 Jul 2014 21:37:06 +0800 From: vv User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:24.0) Gecko/20100101 Thunderbird/24.5.0 MIME-Version: 1.0 CC: linux-media@vger.kernel.org, linux-kernel@vger.kernel.org, m.chehab@samsung.com, zhengdi05@gmail.com Subject: [PATCH]staging: media: lirc_parallel.c: fix coding style To: unlisted-recipients:; (no To-header on input) Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org X-Spam-Status: No, score=-3.4 required=5.0 tests=BAYES_00, DATE_IN_PAST_96_XX, DKIM_ADSP_CUSTOM_MED,DKIM_SIGNED,FREEMAIL_FROM,RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, T_DKIM_INVALID, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From 9d2c680fb573985588d33e31379d50ef3fb6e2fd Mon Sep 17 00:00:00 2001 From: Zheng Di 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 --- 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");