Search Linux Wireless

Re: [PATCH 1/4] rtlwifi: rtl8192{ce,cu,se}: Remove irq_enabled flag

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



On 06/15/2011 06:22 PM, Mike McCormack wrote:
This should be unnecessary if synchronize_irq is used.

Signed-off-by: Mike McCormack<mikem@xxxxxxxxxx>
---
  drivers/net/wireless/rtlwifi/pci.c           |    3 ---
  drivers/net/wireless/rtlwifi/pci.h           |    1 -
  drivers/net/wireless/rtlwifi/rtl8192ce/hw.c  |    2 --
  drivers/net/wireless/rtlwifi/rtl8192cu/mac.c |    9 ---------
  drivers/net/wireless/rtlwifi/rtl8192se/hw.c  |    4 ----
  5 files changed, 0 insertions(+), 19 deletions(-)

I am still testing this change; however, I must NACK it on a technicality. Driver rtl8192de, which is in the pipeline, will fail to compile if irq_enabled is removed from the rtl_pci struct now. In V2, please do not remove this member. When the dust clears, I will fix rtl8192de and remove the variable.

Larry


diff --git a/drivers/net/wireless/rtlwifi/pci.c b/drivers/net/wireless/rtlwifi/pci.c
index cb4e5e8..d4c2da8 100644
--- a/drivers/net/wireless/rtlwifi/pci.c
+++ b/drivers/net/wireless/rtlwifi/pci.c
@@ -794,9 +794,6 @@ static irqreturn_t _rtl_pci_interrupt(int irq, void *dev_id)
  	u32 inta = 0;
  	u32 intb = 0;

-	if (rtlpci->irq_enabled == 0)
-		return IRQ_HANDLED;
-
  	spin_lock_irqsave(&rtlpriv->locks.irq_th_lock, flags);

  	/*read ISR: 4/8bytes */
diff --git a/drivers/net/wireless/rtlwifi/pci.h b/drivers/net/wireless/rtlwifi/pci.h
index 671b1f5..12a25c5 100644
--- a/drivers/net/wireless/rtlwifi/pci.h
+++ b/drivers/net/wireless/rtlwifi/pci.h
@@ -169,7 +169,6 @@ struct rtl_pci {
  	bool first_init;
  	bool being_init_adapter;
  	bool init_ready;
-	bool irq_enabled;

Do not remove this yet.
--
To unsubscribe from this list: send the line "unsubscribe linux-wireless" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html


[Index of Archives]     [Linux Host AP]     [ATH6KL]     [Linux Bluetooth]     [Linux Netdev]     [Kernel Newbies]     [Linux Kernel]     [IDE]     [Security]     [Git]     [Netfilter]     [Bugtraq]     [Yosemite News]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Linux ATA RAID]     [Samba]     [Device Mapper]
  Powered by Linux