From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753729AbaKRIgf (ORCPT ); Tue, 18 Nov 2014 03:36:35 -0500 Received: from mout.web.de ([212.227.15.3]:60254 "EHLO mout.web.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752104AbaKRIgd (ORCPT ); Tue, 18 Nov 2014 03:36:33 -0500 Message-ID: <546B04E2.80000@users.sourceforge.net> Date: Tue, 18 Nov 2014 09:35:46 +0100 From: SF Markus Elfring User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:31.0) Gecko/20100101 Thunderbird/31.2.0 MIME-Version: 1.0 To: Alexander Viro , linux-fsdevel@vger.kernel.org CC: LKML , kernel-janitors@vger.kernel.org, Coccinelle Subject: [PATCH 1/1] fs-eventpoll: Deletion of unnecessary checks before the function call "__pm_stay_awake" References: <5307CAA2.8060406@users.sourceforge.net> <530A086E.8010901@users.sourceforge.net> <530A72AA.3000601@users.sourceforge.net> <530B5FB6.6010207@users.sourceforge.net> <530C5E18.1020800@users.sourceforge.net> <530CD2C4.4050903@users.sourceforge.net> <530CF8FF.8080600@users.sourceforge.net> <530DD06F.4090703@users.sourceforge.net> <5317A59D.4@users.sourceforge.net> In-Reply-To: <5317A59D.4@users.sourceforge.net> Content-Type: text/plain; charset=windows-1252 Content-Transfer-Encoding: 7bit X-Provags-ID: V03:K0:b1XCDbqrMzIIhg0qbsDoLJCM2dsZHN5JFJAeQgmSHiGPEDUhU/x 04AmUb7jYXLA+9Id7CuHfFTcE9r3gGCj9ZKSzgVFws08P3GY1Y036o2XwINgmZMMtdCNPKD mYHBx141eU0aRCdEI3U4mrA2oegHpj93dFQLqKMu8N07gkki34YmAEoQ6FcmTEGnlPF2v/s IRaLXmBMqBWRHevkdE3IQ== X-UI-Out-Filterresults: notjunk:1; Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Markus Elfring Date: Tue, 18 Nov 2014 09:27:16 +0100 The __pm_stay_awake() function tests whether its argument is NULL and then returns immediately. Thus the test around the call is not needed. This issue was detected by using the Coccinelle software. Signed-off-by: Markus Elfring --- fs/eventpoll.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/fs/eventpoll.c b/fs/eventpoll.c index 7bcfff9..eec2e85 100644 --- a/fs/eventpoll.c +++ b/fs/eventpoll.c @@ -555,8 +555,7 @@ static inline void ep_pm_stay_awake(struct epitem *epi) { struct wakeup_source *ws = ep_wakeup_source(epi); - if (ws) - __pm_stay_awake(ws); + __pm_stay_awake(ws); } static inline bool ep_has_wakeup_source(struct epitem *epi) @@ -571,8 +570,7 @@ static inline void ep_pm_stay_awake_rcu(struct epitem *epi) rcu_read_lock(); ws = rcu_dereference(epi->ws); - if (ws) - __pm_stay_awake(ws); + __pm_stay_awake(ws); rcu_read_unlock(); } -- 2.1.3