linux-wireless.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Arend van Spriel <arend@broadcom.com>
To: Kalle Valo <kvalo@codeaurora.org>
Cc: linux-wireless <linux-wireless@vger.kernel.org>,
	Hante Meuleman <meuleman@broadcom.com>,
	Arend van Spriel <arend@broadcom.com>
Subject: [PATCH 4/9] brcmfmac: Remove unncessary variable irq_requested.
Date: Thu, 29 Oct 2015 20:33:14 +0100	[thread overview]
Message-ID: <1446147199-21671-5-git-send-email-arend@broadcom.com> (raw)
In-Reply-To: <1446147199-21671-1-git-send-email-arend@broadcom.com>

From: Hante Meuleman <meuleman@broadcom.com>

The variable irq_requested is unneeded as the functionality
it is providing, is also provided by the variable irq_allocated.

Reviewed-by: Pieter-Paul Giesberts <pieterpg@broadcom.com>
Signed-off-by: Hante Meuleman <meuleman@broadcom.com>
Signed-off-by: Arend van Spriel <arend@broadcom.com>
---
 drivers/net/wireless/brcm80211/brcmfmac/pcie.c | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/drivers/net/wireless/brcm80211/brcmfmac/pcie.c b/drivers/net/wireless/brcm80211/brcmfmac/pcie.c
index 7982d4d..0edaaf5 100644
--- a/drivers/net/wireless/brcm80211/brcmfmac/pcie.c
+++ b/drivers/net/wireless/brcm80211/brcmfmac/pcie.c
@@ -257,7 +257,6 @@ struct brcmf_pcie_core_info {
 struct brcmf_pciedev_info {
 	enum brcmf_pcie_state state;
 	bool in_irq;
-	bool irq_requested;
 	struct pci_dev *pdev;
 	char fw_name[BRCMF_FW_PATH_LEN + BRCMF_FW_NAME_LEN];
 	char nvram_name[BRCMF_FW_PATH_LEN + BRCMF_FW_NAME_LEN];
@@ -889,7 +888,6 @@ static int brcmf_pcie_request_irq(struct brcmf_pciedev_info *devinfo)
 
 	brcmf_dbg(PCIE, "Enter\n");
 	/* is it a v1 or v2 implementation */
-	devinfo->irq_requested = false;
 	pci_enable_msi(pdev);
 	if (devinfo->generic_corerev == BRCMF_PCIE_GENREV1) {
 		if (request_threaded_irq(pdev->irq,
@@ -912,7 +910,6 @@ static int brcmf_pcie_request_irq(struct brcmf_pciedev_info *devinfo)
 			return -EIO;
 		}
 	}
-	devinfo->irq_requested = true;
 	devinfo->irq_allocated = true;
 	return 0;
 }
@@ -930,9 +927,6 @@ static void brcmf_pcie_release_irq(struct brcmf_pciedev_info *devinfo)
 	pdev = devinfo->pdev;
 
 	brcmf_pcie_intr_disable(devinfo);
-	if (!devinfo->irq_requested)
-		return;
-	devinfo->irq_requested = false;
 	free_irq(pdev->irq, devinfo);
 	pci_disable_msi(pdev);
 
-- 
1.9.1


  parent reply	other threads:[~2015-10-29 19:43 UTC|newest]

Thread overview: 19+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-10-29 19:33 [PATCH 0/9] brcmfmac: new device support and cleanup Arend van Spriel
2015-10-29 19:33 ` [PATCH 1/9] brcmfmac: Add support for the BCM4359 11ac RSDB PCIE device Arend van Spriel
2015-11-26 11:57   ` [1/9] " Kalle Valo
2015-11-27  8:59     ` Arend van Spriel
2015-11-30 11:17       ` Kalle Valo
2015-11-30 11:59         ` Arend van Spriel
2015-10-29 19:33 ` [PATCH 2/9] brcmfmac: Simplify and fix usage of brcmf_ifname Arend van Spriel
2015-10-29 19:33 ` [PATCH 3/9] brcmfmac: Remove unnecessary check from start_xmit Arend van Spriel
2015-10-29 19:33 ` Arend van Spriel [this message]
2015-10-29 19:33 ` [PATCH 5/9] brcmfmac: Disable runtime pm for USB Arend van Spriel
2015-10-29 19:33 ` [PATCH 6/9] brcmfmac: Add RSDB support Arend van Spriel
2015-11-12 19:49   ` Kalle Valo
2015-11-13  9:11     ` Arend van Spriel
2015-11-13  9:29       ` Kalle Valo
2015-10-29 19:33 ` [PATCH 7/9] brcmfmac: Use consistent naming for bsscfgidx Arend van Spriel
2015-10-29 19:33 ` [PATCH 8/9] brcmfmac: Use new methods for pcie Power Management Arend van Spriel
2015-10-29 19:33 ` [PATCH 9/9] brcmfmac: Add wowl wake indication report Arend van Spriel
2015-10-29 19:49 ` [PATCH 0/9] brcmfmac: new device support and cleanup Kalle Valo
2015-10-29 20:00   ` Arend van Spriel

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1446147199-21671-5-git-send-email-arend@broadcom.com \
    --to=arend@broadcom.com \
    --cc=kvalo@codeaurora.org \
    --cc=linux-wireless@vger.kernel.org \
    --cc=meuleman@broadcom.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).