From patchwork Wed Jul 6 09:01:21 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andi Shyti X-Patchwork-Id: 9215911 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 A0AFE60467 for ; Wed, 6 Jul 2016 09:45:40 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 90230287D1 for ; Wed, 6 Jul 2016 09:45:40 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 8436C287D9; Wed, 6 Jul 2016 09:45:40 +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 15D5D287D1 for ; Wed, 6 Jul 2016 09:45:40 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753501AbcGFJpP (ORCPT ); Wed, 6 Jul 2016 05:45:15 -0400 Received: from mailout3.samsung.com ([203.254.224.33]:55244 "EHLO mailout3.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753125AbcGFJoD (ORCPT ); Wed, 6 Jul 2016 05:44:03 -0400 Received: from epcpsbgr3.samsung.com (u143.gpu120.samsung.co.kr [203.254.230.143]) by mailout3.samsung.com (Oracle Communications Messaging Server 7.0.5.31.0 64bit (built May 5 2014)) with ESMTP id <0O9W00ZQO0D66G60@mailout3.samsung.com>; Wed, 06 Jul 2016 18:43:54 +0900 (KST) Received: from epcpsbgm1new.samsung.com ( [172.20.52.113]) by epcpsbgr3.samsung.com (EPCPMTA) with SMTP id FC.69.05161.AD2DC775; Wed, 6 Jul 2016 18:43:54 +0900 (KST) X-AuditID: cbfee68f-f79476d000001429-3a-577cd2da116a Received: from epmmp2 ( [203.254.227.17]) by epcpsbgm1new.samsung.com (EPCPMTA) with SMTP id D6.12.02101.9D2DC775; Wed, 6 Jul 2016 18:43:54 +0900 (KST) 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 09/15] [media] lirc_dev: merge three if statements in only one Date: Wed, 06 Jul 2016 18:01:21 +0900 Message-id: <1467795687-10737-10-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+NgFnrOLMWRmVeSWpSXmKPExsWyRsSkUPfWpZpwg/6XHBbbjzxjtVj84zmT xanJz5gsZt9/zGJxedccNoueDVtZLVY/q7BY+PQ7iwOHx/Uln5g9lryx9tjSf5fd48uqa8we fVtWMXp83iTncerrZ/YA9igum5TUnMyy1CJ9uwSujB+bepgLbnNUzF86m7GBsYe9i5GTQ0LA ROLz2S5mCFtM4sK99WxdjFwcQgIrGCVuNk5khCn6ueYXE0RiFqPEz//7oZyPjBK/lt1kAqli E9CUaLr9A6idg0NEwFji3A91kBpmgaeMEvumzgWrERYIlpj64QALiM0ioCqxeu9xsDN4Bdwl Xq/dxAaxTU7i8vQHYHM4geJXlyuBhIUE3CT2b7sJdfUmdokzU9MhxghIfJt8iAWkXEJAVmLT AahnJCUOrrjBMoFReAEjwypG0dSC5ILipPQiY73ixNzi0rx0veT83E2MwPA//e9Z/w7Guwes DzEKcDAq8fBWbK4JF2JNLCuuzD3EaAq0YSKzlGhyPjDK8kriDY3NjCxMTUyNjcwtzZTEeRdK /QwWEkhPLEnNTk0tSC2KLyrNSS0+xMjEwSnVwBgs8oxfYrPY3/7Yu5Mipt0+PWndV4V58y1D vjXr2ohmlqTHzdTU7H3hdKZBzfBb8JOXZW6GXMK+imHSF2VV005Pvq3xv+S0wLEgpdoPU+tO bTB7V8vmw7Tj1uKiRp3XByyZvjqp7dvzbO624HeX1glarWTqXRC5tCt2wUb11coCW0OiHtxK n6/EUpyRaKjFXFScCABVt56segIAAA== X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFtrKIsWRmVeSWpSXmKPExsVy+t9jQd1bl2rCDe41s1hsP/KM1WLxj+dM FqcmP2OymH3/MYvF5V1z2Cx6NmxltVj9rMJi4dPvLA4cHteXfGL2WPLG2mNL/112jy+rrjF7 9G1ZxejxeZOcx6mvn9kD2KMaGG0yUhNTUosUUvOS81My89JtlbyD453jTc0MDHUNLS3MlRTy EnNTbZVcfAJ03TJzgI5SUihLzCkFCgUkFhcr6dthmhAa4qZrAdMYoesbEgTXY2SABhLWMGb8 2NTDXHCbo2L+0tmMDYw97F2MnBwSAiYSP9f8YoKwxSQu3FvP1sXIxSEkMItR4uf//UwQzkdG iV/LboJVsQloSjTd/gFUxcEhImAsce6HOkgNs8BTRol9U+eC1QgLBEtM/XCABcRmEVCVWL33 ONg2XgF3iddrN7FBbJOTuDz9AdgcTqD41eVKIGEhATeJ/dtusk9g5F3AyLCKUSK1ILmgOCk9 1zAvtVyvODG3uDQvXS85P3cTIzjKnkntYDy4y/0QowAHoxIP74Tn1eFCrIllxZW5hxglOJiV RHhtLtSEC/GmJFZWpRblxxeV5qQWH2I0BbprIrOUaHI+MAHklcQbGpuYGVkamRtaGBmbK4nz Pv6/LkxIID2xJDU7NbUgtQimj4mDU6qB0YEv5Kwsm/xntXmbNmRGeF1vEn9WoZJwfVaSm1jv XJ+1rz+1VeSdaJthsv7iUwmL/TuWWxc7Om4oj+jfXp0+l9eRtaNEQzTs1Oazc7nv67/aW/v7 wwWJw2tVnN4Xz3/lZ1JbFmzH1n3qXbM61+Prhk/i73gUuLobr2ENuf110bduHlP36IAoJZbi jERDLeai4kQAcDAT+cgCAAA= 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 The three if statements check the same thing, merge them in only one statement. Signed-off-by: Andi Shyti --- drivers/media/rc/lirc_dev.c | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/drivers/media/rc/lirc_dev.c b/drivers/media/rc/lirc_dev.c index a8a5116..71ff820 100644 --- a/drivers/media/rc/lirc_dev.c +++ b/drivers/media/rc/lirc_dev.c @@ -270,15 +270,10 @@ static int lirc_allocate_driver(struct lirc_driver *d) dev_err(d->dev, "add_to_buf not set\n"); return -EBADRQC; } - } else if (!(d->fops && d->fops->read) && !d->rbuf) { - dev_err(d->dev, "fops->read and rbuf are NULL!\n"); + } else if (!d->rbuf && !(d->fops && d->fops->read && + d->fops->poll && d->fops->unlocked_ioctl)) { + dev_err(d->dev, "undefined read, poll, ioctl\n"); return -EBADRQC; - } else if (!d->rbuf) { - if (!(d->fops && d->fops->read && d->fops->poll && - d->fops->unlocked_ioctl)) { - dev_err(d->dev, "undefined read, poll, ioctl\n"); - return -EBADRQC; - } } mutex_lock(&lirc_dev_lock);