From patchwork Fri Aug 14 11:39:19 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Lee Jones X-Patchwork-Id: 1344975 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=vger.kernel.org (client-ip=23.128.96.18; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.a=rsa-sha256 header.s=google header.b=RgQFNgl6; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by ozlabs.org (Postfix) with ESMTP id 4BShPD2CfNz9sTX for ; Fri, 14 Aug 2020 21:42:08 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728377AbgHNLmG (ORCPT ); Fri, 14 Aug 2020 07:42:06 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39764 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728116AbgHNLkS (ORCPT ); Fri, 14 Aug 2020 07:40:18 -0400 Received: from mail-wm1-x344.google.com (mail-wm1-x344.google.com [IPv6:2a00:1450:4864:20::344]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A7BEFC061347 for ; Fri, 14 Aug 2020 04:40:07 -0700 (PDT) Received: by mail-wm1-x344.google.com with SMTP id d190so7207520wmd.4 for ; Fri, 14 Aug 2020 04:40:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=IFZOPtR6KI+rxA/lqxwIdqFyIwqMfS+8QowGRbn6S6c=; b=RgQFNgl65ZIR7EMkc8YqH6kzCDZzK/89NbSMs4w9VAwULPTsl0jNEfmDyXCvm0w3HF j5GajrrvhVxPKS/5R5bksj7YIWj5tsqvD2VViue+aMDKzPBO/FPUPxX6FHjEG/oMh4bq Ei4uXWbe4G2s+N6spzm1Yj4tWvfopFn2D879+kWi5cR4sP+OfELE2d2WxHIuMeHKWvMG WG5joLqe3oiEUTFgECwQznnGP46n2Po+9cDyOXClExY1/Qp5tZqQwn4+oXUXMprnVHDR 4mqoISP/KmmsqEYeuQGoxt72slmfKg0Njo46PAfR1+A0c1uOd3pnxnbMNZVp+NGv60LJ 8vhg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=IFZOPtR6KI+rxA/lqxwIdqFyIwqMfS+8QowGRbn6S6c=; b=b4wCiJ3P+lmRRijR2hWgUYtRn+5uS0xoTZRKRdVRzGYZ/91bZYTmSyMQorSYTTlhuo Ywhvo3znN7J7EWsb09awnuEG5yVH85QFVa6pdKyU3ofu0/kO47leUotnP2byt7BK/TlM B3JCEl6TiheJqLxwt+ImLFEIBCmpX7/XSUBdMe7mOvEvRu0CC0sG8fX1B/26LVxFK/Y3 UAhC+eXopwdpXQvWdUJ4wFCytMCOVNgwrdEoqPC9EHngA1VQG0e78gnqlxpc4BLMQBro +0x9r1xFfwmrmjUPtuNV6iK1jvmE89UErtrdmqSEN94KfLEJ31SALu802xigT8yELttQ R62g== X-Gm-Message-State: AOAM531UCWBykc8wUVpyRTTX53YgZfz8bgozIwS7JjEhVimRTsqtGiEt UP2FBvWvIQ0NBeuUV15+1A+wQw== X-Google-Smtp-Source: ABdhPJyOkQHG7sfqRyJMAFAZsxAi8frxHRFAAgp/0CDRrGUgb2MXZIXsvYpokPZrFhEajNXubg+4AQ== X-Received: by 2002:a1c:18b:: with SMTP id 133mr2205145wmb.178.1597405206403; Fri, 14 Aug 2020 04:40:06 -0700 (PDT) Received: from dell.default ([95.149.164.62]) by smtp.gmail.com with ESMTPSA id 32sm16409129wrh.18.2020.08.14.04.40.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 14 Aug 2020 04:40:05 -0700 (PDT) From: Lee Jones To: davem@davemloft.net, kuba@kernel.org Cc: linux-kernel@vger.kernel.org, Lee Jones , Stanislav Yakovlev , Kalle Valo , Gerald Combs , Linux Wireless , linux-wireless@vger.kernel.org, netdev@vger.kernel.org Subject: [PATCH 16/30] net: wireless: intel: ipw2200: Remove set but unused variables 'rc' and 'w' Date: Fri, 14 Aug 2020 12:39:19 +0100 Message-Id: <20200814113933.1903438-17-lee.jones@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200814113933.1903438-1-lee.jones@linaro.org> References: <20200814113933.1903438-1-lee.jones@linaro.org> MIME-Version: 1.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Fixes the following W=1 kernel build warning(s): drivers/net/wireless/intel/ipw2x00/ipw2200.c: In function ‘ipw_irq_tasklet’: drivers/net/wireless/intel/ipw2x00/ipw2200.c:1953:6: warning: variable ‘rc’ set but not used [-Wunused-but-set-variable] drivers/net/wireless/intel/ipw2x00/ipw2200.c: In function ‘ipw_rx’: drivers/net/wireless/intel/ipw2x00/ipw2200.c:8251:9: warning: variable ‘w’ set but not used [-Wunused-but-set-variable] Cc: Stanislav Yakovlev Cc: Kalle Valo Cc: "David S. Miller" Cc: Jakub Kicinski Cc: Gerald Combs Cc: Linux Wireless Cc: linux-wireless@vger.kernel.org Cc: netdev@vger.kernel.org Signed-off-by: Lee Jones --- drivers/net/wireless/intel/ipw2x00/ipw2200.c | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/drivers/net/wireless/intel/ipw2x00/ipw2200.c b/drivers/net/wireless/intel/ipw2x00/ipw2200.c index 129ef2f6248ae..5345f90837f5f 100644 --- a/drivers/net/wireless/intel/ipw2x00/ipw2200.c +++ b/drivers/net/wireless/intel/ipw2x00/ipw2200.c @@ -1950,7 +1950,6 @@ static void ipw_irq_tasklet(unsigned long data) struct ipw_priv *priv = (struct ipw_priv *)data; u32 inta, inta_mask, handled = 0; unsigned long flags; - int rc = 0; spin_lock_irqsave(&priv->irq_lock, flags); @@ -1980,7 +1979,7 @@ static void ipw_irq_tasklet(unsigned long data) if (inta & IPW_INTA_BIT_TX_CMD_QUEUE) { IPW_DEBUG_HC("Command completed.\n"); - rc = ipw_queue_tx_reclaim(priv, &priv->txq_cmd, -1); + ipw_queue_tx_reclaim(priv, &priv->txq_cmd, -1); priv->status &= ~STATUS_HCMD_ACTIVE; wake_up_interruptible(&priv->wait_command_queue); handled |= IPW_INTA_BIT_TX_CMD_QUEUE; @@ -1988,25 +1987,25 @@ static void ipw_irq_tasklet(unsigned long data) if (inta & IPW_INTA_BIT_TX_QUEUE_1) { IPW_DEBUG_TX("TX_QUEUE_1\n"); - rc = ipw_queue_tx_reclaim(priv, &priv->txq[0], 0); + ipw_queue_tx_reclaim(priv, &priv->txq[0], 0); handled |= IPW_INTA_BIT_TX_QUEUE_1; } if (inta & IPW_INTA_BIT_TX_QUEUE_2) { IPW_DEBUG_TX("TX_QUEUE_2\n"); - rc = ipw_queue_tx_reclaim(priv, &priv->txq[1], 1); + ipw_queue_tx_reclaim(priv, &priv->txq[1], 1); handled |= IPW_INTA_BIT_TX_QUEUE_2; } if (inta & IPW_INTA_BIT_TX_QUEUE_3) { IPW_DEBUG_TX("TX_QUEUE_3\n"); - rc = ipw_queue_tx_reclaim(priv, &priv->txq[2], 2); + ipw_queue_tx_reclaim(priv, &priv->txq[2], 2); handled |= IPW_INTA_BIT_TX_QUEUE_3; } if (inta & IPW_INTA_BIT_TX_QUEUE_4) { IPW_DEBUG_TX("TX_QUEUE_4\n"); - rc = ipw_queue_tx_reclaim(priv, &priv->txq[3], 3); + ipw_queue_tx_reclaim(priv, &priv->txq[3], 3); handled |= IPW_INTA_BIT_TX_QUEUE_4; } @@ -8248,12 +8247,12 @@ static void ipw_rx(struct ipw_priv *priv) struct ipw_rx_mem_buffer *rxb; struct ipw_rx_packet *pkt; struct libipw_hdr_4addr *header; - u32 r, w, i; + u32 r, i; u8 network_packet; u8 fill_rx = 0; r = ipw_read32(priv, IPW_RX_READ_INDEX); - w = ipw_read32(priv, IPW_RX_WRITE_INDEX); + ipw_read32(priv, IPW_RX_WRITE_INDEX); i = priv->rxq->read; if (ipw_rx_queue_space (priv->rxq) > (RX_QUEUE_SIZE / 2))