package/kernel/mac80211/patches/374-0004-brcmfmac-Remove-unncessary-variable-irq_requested.patch

   1 From: Hante Meuleman <meuleman@broadcom.com>
   2 Date: Thu, 29 Oct 2015 20:33:14 +0100
   3 Subject: [PATCH] brcmfmac: Remove unncessary variable irq_requested.
   4
   5 The variable irq_requested is unneeded as the functionality
   6 it is providing, is also provided by the variable irq_allocated.
   7
   8 Reviewed-by: Pieter-Paul Giesberts <pieterpg@broadcom.com>
   9 Signed-off-by: Hante Meuleman <meuleman@broadcom.com>
  10 Signed-off-by: Arend van Spriel <arend@broadcom.com>
  11 Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
  12 ---
  13
  14 --- a/drivers/net/wireless/brcm80211/brcmfmac/pcie.c
  15 +++ b/drivers/net/wireless/brcm80211/brcmfmac/pcie.c
  16 @@ -257,7 +257,6 @@ struct brcmf_pcie_core_info {
  17  struct brcmf_pciedev_info {
  18         enum brcmf_pcie_state state;
  19         bool in_irq;
  20 -       bool irq_requested;
  21         struct pci_dev *pdev;
  22         char fw_name[BRCMF_FW_PATH_LEN + BRCMF_FW_NAME_LEN];
  23         char nvram_name[BRCMF_FW_PATH_LEN + BRCMF_FW_NAME_LEN];
  24 @@ -889,7 +888,6 @@ static int brcmf_pcie_request_irq(struct
  25
  26         brcmf_dbg(PCIE, "Enter\n");
  27         /* is it a v1 or v2 implementation */
  28 -       devinfo->irq_requested = false;
  29         pci_enable_msi(pdev);
  30         if (devinfo->generic_corerev == BRCMF_PCIE_GENREV1) {
  31                 if (request_threaded_irq(pdev->irq,
  32 @@ -912,7 +910,6 @@ static int brcmf_pcie_request_irq(struct
  33                         return -EIO;
  34                 }
  35         }
  36 -       devinfo->irq_requested = true;
  37         devinfo->irq_allocated = true;
  38         return 0;
  39  }
  40 @@ -930,9 +927,6 @@ static void brcmf_pcie_release_irq(struc
  41         pdev = devinfo->pdev;
  42
  43         brcmf_pcie_intr_disable(devinfo);
  44 -       if (!devinfo->irq_requested)
  45 -               return;
  46 -       devinfo->irq_requested = false;
  47         free_irq(pdev->irq, devinfo);
  48         pci_disable_msi(pdev);
  49