From patchwork Wed Jul 6 09:01:20 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andi Shyti X-Patchwork-Id: 9215933 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 0E11A60467 for ; Wed, 6 Jul 2016 09:46:53 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id F3486287D6 for ; Wed, 6 Jul 2016 09:46:52 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id E7BEB287DA; Wed, 6 Jul 2016 09:46:52 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 4B876287D6 for ; Wed, 6 Jul 2016 09:46:52 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753308AbcGFJqD (ORCPT ); Wed, 6 Jul 2016 05:46:03 -0400 Received: from mailout4.samsung.com ([203.254.224.34]:46763 "EHLO mailout4.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753067AbcGFJoA (ORCPT ); Wed, 6 Jul 2016 05:44:00 -0400 Received: from epcpsbgr3.samsung.com (u143.gpu120.samsung.co.kr [203.254.230.143]) by mailout4.samsung.com (Oracle Communications Messaging Server 7.0.5.31.0 64bit (built May 5 2014)) with ESMTP id <0O9W02AQ80D6LJ10@mailout4.samsung.com>; Wed, 06 Jul 2016 18:43:54 +0900 (KST) Received: from epcpsbgm2new.samsung.com ( [172.20.52.112]) by epcpsbgr3.samsung.com (EPCPMTA) with SMTP id EC.69.05161.AD2DC775; Wed, 6 Jul 2016 18:43:54 +0900 (KST) X-AuditID: cbfee68f-f79476d000001429-38-577cd2daaeba Received: from epmmp2 ( [203.254.227.17]) by epcpsbgm2new.samsung.com (EPCPMTA) with SMTP id 9C.B5.04429.9D2DC775; Wed, 6 Jul 2016 02:43:54 -0700 (MST) Received: from samsunx.samsung ([10.113.63.54]) by mmp2.samsung.com (Oracle Communications Messaging Server 7.0.5.31.0 64bit (built May 5 2014)) with ESMTPA id <0O9W003BE0D2J600@mmp2.samsung.com>; Wed, 06 Jul 2016 18:43:53 +0900 (KST) From: Andi Shyti To: Mauro Carvalho Chehab Cc: Joe Perches , Sean Young , Hans Verkuil , linux-media@vger.kernel.org, linux-kernel@vger.kernel.org, Andi Shyti , Andi Shyti Subject: [PATCH v3 08/15] [media] lirc_dev: remove double if ... else statement Date: Wed, 06 Jul 2016 18:01:20 +0900 Message-id: <1467795687-10737-9-git-send-email-andi.shyti@samsung.com> X-Mailer: git-send-email 2.8.1 In-reply-to: <1467795687-10737-1-git-send-email-andi.shyti@samsung.com> References: <1467795687-10737-1-git-send-email-andi.shyti@samsung.com> X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFnrBLMWRmVeSWpSXmKPExsWyRsSkQPfWpZpwg2mr2C22H3nGarH4x3Mm i1OTnzFZzL7/mMXi8q45bBY9G7ayWqx+VmGx8Ol3FgcOj+tLPjF7LHlj7bGl/y67x5dV15g9 +rasYvT4vEnO49TXz+wB7FFcNimpOZllqUX6dglcGTc+fGIpmMRdsWDtTOYGxqccXYycHBIC JhJfO04wQ9hiEhfurWfrYuTiEBJYwSjx8NY/FpiiswfbWCESsxgljjxthnI+Mkr8WnaTCaSK TUBToun2D6B2Dg4RAWOJcz/UQWqYBZ4ySuybOhesRljAX+JCXx/YVBYBVYnla5vZQGxeATeJ Nxf+MkFsk5O4PP0B2BxOAXeJq8uVQMJCQCX7t91kB5kpIbCNXWLKv91QcwQkvk0+xAJSLyEg K7HpANQ3khIHV9xgmcAovICRYRWjaGpBckFxUnqRsV5xYm5xaV66XnJ+7iZGYASc/vesfwfj 3QPWhxgFOBiVeHgrNteEC7EmlhVX5h5iNAXaMJFZSjQ5HxhneSXxhsZmRhamJqbGRuaWZkri vAulfgYLCaQnlqRmp6YWpBbFF5XmpBYfYmTi4JRqYFyQefhmNLO1mUHF0bm8Mg5fNJ2TDd1n pUzmWv+HOTSlOd5X0LqgYLvkjwttX6IaFkRqVHiaszjPPG+/ZdXE3tfMT27M+PRq4eIGicKt Hi9uNK/QZm9wf691Ye7+SYKmfUlm13nWiBS9N7vmP/XPAx6VkqZTVWJOQYE9xV9ixZjsfA/l XLRercRSnJFoqMVcVJwIAJ93dhl7AgAA X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFtrKIsWRmVeSWpSXmKPExsVy+t9jQd1bl2rCDaYtYbLYfuQZq8XiH8+Z LE5NfsZkMfv+YxaLy7vmsFn0bNjKarH6WYXFwqffWRw4PK4v+cTsseSNtceW/rvsHl9WXWP2 6NuyitHj8yY5j1NfP7MHsEc1MNpkpCampBYppOYl56dk5qXbKnkHxzvHm5oZGOoaWlqYKynk Jeam2iq5+AToumXmAB2lpFCWmFMKFApILC5W0rfDNCE0xE3XAqYxQtc3JAiux8gADSSsYcy4 8eETS8Ek7ooFa2cyNzA+5ehi5OSQEDCROHuwjRXCFpO4cG89WxcjF4eQwCxGiSNPm1khnI+M Er+W3WQCqWIT0JRouv0DqIqDQ0TAWOLcD3WQGmaBp4wS+6bOBasRFvCXuNDXxwJiswioSixf 28wGYvMKuEm8ufCXCWKbnMTl6Q/A5nAKuEtcXa4EEhYCKtm/7Sb7BEbeBYwMqxglUguSC4qT 0nON8lLL9YoTc4tL89L1kvNzNzGCo+yZ9A7Gw7vcDzEKcDAq8fCekKgJF2JNLCuuzD3EKMHB rCTCa3MBKMSbklhZlVqUH19UmpNafIjRFOiuicxSosn5wASQVxJvaGxiZmRpZG5oYWRsriTO +/j/ujAhgfTEktTs1NSC1CKYPiYOTqkGxi2RGyd5yxxmWnFo/uRywSWFS0P/3rrHG7L0W57q agsrzvot0++vXzvt6pmtWQKTT0sYxey+FPq3xb3VdtPRzeLs/GkLrp/3bX3r9XqR/Ce75xxc a3Q7BQTPBiyv1DhjdUZpw+fyy6IiFclcjyTX/VCt3G7iePHs6xdvj6+dOPkTj2CW8MLPCRVK LMUZiYZazEXFiQAnzeTryAIAAA== DLP-Filter: Pass X-MTR: 20000000000000000@CPGS X-CFilter-Loop: Reflected Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP There are two if ... else which check the same thing in different part of the code, they can be merged in a single check. Signed-off-by: Andi Shyti --- drivers/media/rc/lirc_dev.c | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/drivers/media/rc/lirc_dev.c b/drivers/media/rc/lirc_dev.c index c2826a7..a8a5116 100644 --- a/drivers/media/rc/lirc_dev.c +++ b/drivers/media/rc/lirc_dev.c @@ -310,13 +310,6 @@ static int lirc_allocate_driver(struct lirc_driver *d) irctls[minor] = ir; d->minor = minor; - if (d->sample_rate) { - ir->jiffies_to_wait = HZ / d->sample_rate; - } else { - /* it means - wait for external event in task queue */ - ir->jiffies_to_wait = 0; - } - /* some safety check 8-) */ d->name[sizeof(d->name)-1] = '\0'; @@ -330,6 +323,8 @@ static int lirc_allocate_driver(struct lirc_driver *d) "lirc%u", ir->d.minor); if (d->sample_rate) { + ir->jiffies_to_wait = HZ / d->sample_rate; + /* try to fire up polling thread */ ir->task = kthread_run(lirc_thread, (void *)ir, "lirc_dev"); if (IS_ERR(ir->task)) { @@ -338,6 +333,9 @@ static int lirc_allocate_driver(struct lirc_driver *d) err = -ECHILD; goto out_sysfs; } + } else { + /* it means - wait for external event in task queue */ + ir->jiffies_to_wait = 0; } err = lirc_cdev_add(ir);