From patchwork Tue Nov 12 00:01:26 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michal Nazarewicz X-Patchwork-Id: 290525 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 811252C0099 for ; Tue, 12 Nov 2013 11:01:37 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754449Ab3KLABe (ORCPT ); Mon, 11 Nov 2013 19:01:34 -0500 Received: from mail-ea0-f171.google.com ([209.85.215.171]:43959 "EHLO mail-ea0-f171.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753867Ab3KLABa (ORCPT ); Mon, 11 Nov 2013 19:01:30 -0500 Received: by mail-ea0-f171.google.com with SMTP id h10so710964eak.2 for ; Mon, 11 Nov 2013 16:01:28 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=sender:from:to:cc:subject:in-reply-to:organization:references :user-agent:face:date:message-id:mime-version:content-type; bh=RH9gnBkcHTedX+hfw0Fuiv4cU66Ndjge3GZS289GKuA=; b=TRBrrfRK5mbTm2r7QKKnzWp6Dlj6cj4GFMq6jdRt9kEdxnWKlifvpkn5hOVSZ7iMsV 9eC/A8OjgG/9C/y//se7SHqiN2oBcjcofC64tI68oa1ngr0w/mXjajrqPMuxNB/ZTaBQ ubopmsRHe233Urw1oaSVcEOvMswVx+IYwbl7nukBdzsscxX4phZc557mzSaTCqIqU7mX 9lIblCYbwM4KJ82Yp6NPVmjxQ+6pvLq4CAm7IPZGeyFpAKlJ1Aw7ZzZ0VbgkHbaVioJP XlIZt+0qGNDGvrJuS7GEsKYT+Eo3lHT/xIvnn5Po5OJjBwiWt38NAAwdXql7prP4/l5I 3jGg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:sender:from:to:cc:subject:in-reply-to :organization:references:user-agent:face:date:message-id :mime-version:content-type; bh=RH9gnBkcHTedX+hfw0Fuiv4cU66Ndjge3GZS289GKuA=; b=R/Gkjo+3ToRLQYFmGqDymnpDn6f0bZuiHUxqSqV6dZgT2NNFGJb/llK68XYnx8/8nJ ErO1EF+NcDjremZRxrb8FTV4LXlbF0l1hufGJcLo1JHKEkKDplCNF77VmsE55yBHvJON wWxSR8ljSstQfnUll+BTyoN3iTo1xPPHyJYoS+ui2zxZu98s3eL4GuIwKxJoPbnXSxUc WWKKWUkzQLRfgdn/BX5UwiX6h019CWrRMCB/Eo8Y0tYl9JCSzzqk8NaOPHtWANilLeyC wN8HQJS8hlSZOxcr/9Myn6zJ9LY8/yJ5tSM3n/JDbxsKddZIOSYhCtxtSD22SAdznTvS 8eNQ== X-Gm-Message-State: ALoCoQmlhUrrE/gaNLsdR3o8zWjBydbKkkFfE+R0pPxIE4bOvWLAx0DLsvm1n4ToLiZKu0DJtXt3ykk8sQwU5nOrlTgFKiLaGhnfjTd6lGgiQ7Qsa4ITKjr6MWJ1HAWWyO1OqCSc9RGT4Q2w5tXTlrMacKVoG82kEBdTz9Jag5S3FJqsANowLcer6t0T+w7AhW3Hlm8iJs5C0vvwtlxcb3w0/hcTbbbnLw== X-Received: by 10.15.42.193 with SMTP id u41mr13234864eev.16.1384214488778; Mon, 11 Nov 2013 16:01:28 -0800 (PST) Received: from mpn-glaptop.roam.corp.google.com ([2620:0:105f:311:f52d:f795:45b0:ff8d]) by mx.google.com with ESMTPSA id w6sm68999323eeo.12.2013.11.11.16.01.27 for (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Mon, 11 Nov 2013 16:01:27 -0800 (PST) From: Michal Nazarewicz To: Johannes Berg Cc: Sergei Shtylyov , Emmanuel Grumbach , "John W. Linville" , Intel Linux Wireless , linux-wireless@vger.kernel.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCHv2.1] net: wireless: iwlwifi: remove minor dead code In-Reply-To: <1384177312.14334.12.camel@jlt4.sipsolutions.net> Organization: http://mina86.com/ References: <1384110397-24386-1-git-send-email-mpn@google.com> <527FDB50.1050902@cogentembedded.com> <87iow080zv.fsf@mina86.com> <1384177312.14334.12.camel@jlt4.sipsolutions.net> User-Agent: Notmuch/0.15.2+55~geb6e9d8 (http://notmuchmail.org) Emacs/24.3.50.1 (x86_64-unknown-linux-gnu) X-Face: PbkBB1w#)bOqd`iCe"Ds{e+!C7`pkC9a|f)Qo^BMQvy\q5x3?vDQJeN(DS?|-^$uMti[3D*#^_Ts"pU$jBQLq~Ud6iNwAw_r_o_4]|JO?]}P_}Nc&"p#D(ZgUb4uCNPe7~a[DbPG0T~!&c.y$Ur,=N4RT>]dNpd; KFrfMCylc}gc??'U2j,!8%xdD Face: iVBORw0KGgoAAAANSUhEUgAAADAAAAAwBAMAAAClLOS0AAAAJFBMVEWbfGlUPDDHgE57V0jUupKjgIObY0PLrom9mH4dFRK4gmjPs41MxjOgAAACQElEQVQ4jW3TMWvbQBQHcBk1xE6WyALX1069oZBMlq+ouUwpEQQ6uRjttkWP4CmBgGM0BQLBdPFZYPsyFUo6uEtKDQ7oy/U96XR2Ux8ehH/89Z6enqxBcS7Lg81jmSuujrfCZcLI/TYYvbGj+jbgFpHJ/bqQAUISj8iLyu4LuFHJTosxsucO4jSDNE0Hq3hwK/ceQ5sx97b8LcUDsILfk+ovHkOIsMbBfg43VuQ5Ln9YAGCkUdKJoXR9EclFBhixy3EGVz1K6eEkhxCAkeMMnqoAhAKwhoUJkDrCqvbecaYINlFKSRS1i12VKH1XpUd4qxL876EkMcDvHj3s5RBajHHMlA5iK32e0C7VgG0RlzFPvoYHZLRmAC0BmNcBruhkE0KsMsbEc62ZwUJDxWUdMsMhVqovoT96i/DnX/ASvz/6hbCabELLk/6FF/8PNpPCGqcZTGFcBhhAaZZDbQPaAB3+KrWWy2XgbYDNIinkdWAFcCpraDE/knwe5DBqGmgzESl1p2E4MWAz0VUPgYYzmfWb9yS4vCvgsxJriNTHoIBz5YteBvg+VGISQWUqhMiByPIPpygeDBE6elD973xWwKkEiHZAHKjhuPsFnBuArrzxtakRcISv+XMIPl4aGBUJm8Emk7qBYU8IlgNEIpiJhk/No24jHwkKTFHDWfPniR4iw5vJaw2nzSjfq2zffcE/GDjRC2dn0J0XwPAbDL84TvaFCJEU4Oml9pRyEUhR3Cl2t01AoEjRbs0sYugp14/4X5n4pU4EHHnMAAAAAElFTkSuQmCC X-PGP: 50751FF4 X-PGP-FP: AC1F 5F5C D418 88F8 CC84 5858 2060 4012 5075 1FF4 X-Hashcash: 1:20:131111:linux-kernel@vger.kernel.org::gh9nsTvmTJyc2b3l:0000000000000000000000000000000000k76 X-Hashcash: 1:20:131111:linville@tuxdriver.com::FtUuXDwOUl+wSFVF:0000000000000000000000000000000000000000/sq X-Hashcash: 1:20:131111:sergei.shtylyov@cogentembedded.com::mKgnna8jWUO33XnT:00000000000000000000000000001fQ X-Hashcash: 1:20:131111:emmanuel.grumbach@intel.com::7FGELPuv9uPnNUhK:000000000000000000000000000000000024jk X-Hashcash: 1:20:131111:johannes@sipsolutions.net::xGZ1/9oUt+fopLFF:0000000000000000000000000000000000003QFb X-Hashcash: 1:20:131111:netdev@vger.kernel.org::IkpHwuxSbNYhtyo5:0000000000000000000000000000000000000004jCw X-Hashcash: 1:20:131111:ilw@linux.intel.com::xZhESyqkrBns5Ran:00000000000000000000000000000000000000000073vJ X-Hashcash: 1:20:131111:linux-wireless@vger.kernel.org::IPKPFSNEGJMhM+pU:0000000000000000000000000000000DRGI Date: Tue, 12 Nov 2013 01:01:26 +0100 Message-ID: MIME-Version: 1.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org inta is checked to be zero in a IRQ_NONE branch so afterwards it cannot be zero as it is never modified. Signed-off-by: Michal Nazarewicz --- drivers/net/wireless/iwlwifi/pcie/rx.c | 24 +++++++++--------------- 1 file changed, 9 insertions(+), 15 deletions(-) On Mon, Nov 11 2013, Johannes Berg wrote: > no signed-off-by Sorry, fixed. Interestingly, I did not forget about it in my first patch. diff --git a/drivers/net/wireless/iwlwifi/pcie/rx.c b/drivers/net/wireless/iwlwifi/pcie/rx.c index 3f237b4..7d0fdc0 100644 --- a/drivers/net/wireless/iwlwifi/pcie/rx.c +++ b/drivers/net/wireless/iwlwifi/pcie/rx.c @@ -1121,7 +1121,6 @@ static irqreturn_t iwl_pcie_isr(int irq, void *data) struct iwl_trans *trans = data; struct iwl_trans_pcie *trans_pcie = IWL_TRANS_GET_PCIE_TRANS(trans); u32 inta, inta_mask; - irqreturn_t ret = IRQ_NONE; lockdep_assert_held(&trans_pcie->irq_lock); @@ -1150,7 +1149,14 @@ static irqreturn_t iwl_pcie_isr(int irq, void *data) * or due to sporadic interrupts thrown from our NIC. */ if (!inta) { IWL_DEBUG_ISR(trans, "Ignore interrupt, inta == 0\n"); - goto none; + /* re-enable interrupts here since we don't have anything to + * service. only Re-enable if disabled by irq and no + * schedules tasklet. + */ + if (test_bit(STATUS_INT_ENABLED, &trans_pcie->status) && + !trans_pcie->inta) + iwl_enable_interrupts(trans); + return IRQ_NONE; } if ((inta == 0xFFFFFFFF) || ((inta & 0xFFFFFFF0) == 0xa5a5a5a0)) { @@ -1168,19 +1174,7 @@ static irqreturn_t iwl_pcie_isr(int irq, void *data) trans_pcie->inta |= inta; /* the thread will service interrupts and re-enable them */ - if (likely(inta)) - return IRQ_WAKE_THREAD; - - ret = IRQ_HANDLED; - -none: - /* re-enable interrupts here since we don't have anything to service. */ - /* only Re-enable if disabled by irq and no schedules tasklet. */ - if (test_bit(STATUS_INT_ENABLED, &trans_pcie->status) && - !trans_pcie->inta) - iwl_enable_interrupts(trans); - - return ret; + return IRQ_WAKE_THREAD; } /* interrupt handler using ict table, with this interrupt driver will