iwlwifi: move register access lock into transport

Move the reg_lock that protects HW register access
into the transport implementation. Locking is no
longer exposed, but handled internally in grab and
release NIC access. This simplifies the users.

Signed-off-by: Lilach Edelstein <lilach.edelstein@intel.com>
Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>

1 files changed, 14 insertions, 29 deletions

diff --git a/drivers/net/wireless/iwlwifi/iwl-io.c b/drivers/net/wireless/iwlwifi/iwl-io.c
index 7ef47389953e..276410d82de4 100644
--- a/drivers/net/wireless/iwlwifi/iwl-io.c
+++ b/drivers/net/wireless/iwlwifi/iwl-io.c
@@ -55,13 +55,10 @@ u32 iwl_read_direct32(struct iwl_trans *trans, u32 reg)
 {
         u32 value = 0x5a5a5a5a;
         unsigned long flags;
-
-        spin_lock_irqsave(&trans->reg_lock, flags);
-        if (iwl_trans_grab_nic_access(trans, false)) {
+        if (iwl_trans_grab_nic_access(trans, false, &flags)) {
                 value = iwl_read32(trans, reg);
-                iwl_trans_release_nic_access(trans);
+                iwl_trans_release_nic_access(trans, &flags);
         }
-        spin_unlock_irqrestore(&trans->reg_lock, flags);
 
         return value;
 }
@@ -71,12 +68,10 @@ void iwl_write_direct32(struct iwl_trans *trans, u32 reg, u32 value)
 {
         unsigned long flags;
 
-        spin_lock_irqsave(&trans->reg_lock, flags);
-        if (iwl_trans_grab_nic_access(trans, false)) {
+        if (iwl_trans_grab_nic_access(trans, false, &flags)) {
                 iwl_write32(trans, reg, value);
-                iwl_trans_release_nic_access(trans);
+                iwl_trans_release_nic_access(trans, &flags);
         }
-        spin_unlock_irqrestore(&trans->reg_lock, flags);
 }
 EXPORT_SYMBOL_GPL(iwl_write_direct32);
 
@@ -114,12 +109,10 @@ u32 iwl_read_prph(struct iwl_trans *trans, u32 ofs)
         unsigned long flags;
         u32 val = 0x5a5a5a5a;
 
-        spin_lock_irqsave(&trans->reg_lock, flags);
-        if (iwl_trans_grab_nic_access(trans, false)) {
+        if (iwl_trans_grab_nic_access(trans, false, &flags)) {
                 val = __iwl_read_prph(trans, ofs);
-                iwl_trans_release_nic_access(trans);
+                iwl_trans_release_nic_access(trans, &flags);
         }
-        spin_unlock_irqrestore(&trans->reg_lock, flags);
         return val;
 }
 EXPORT_SYMBOL_GPL(iwl_read_prph);
@@ -128,12 +121,10 @@ void iwl_write_prph(struct iwl_trans *trans, u32 ofs, u32 val)
 {
         unsigned long flags;
 
-        spin_lock_irqsave(&trans->reg_lock, flags);
-        if (iwl_trans_grab_nic_access(trans, false)) {
+        if (iwl_trans_grab_nic_access(trans, false, &flags)) {
                 __iwl_write_prph(trans, ofs, val);
-                iwl_trans_release_nic_access(trans);
+                iwl_trans_release_nic_access(trans, &flags);
         }
-        spin_unlock_irqrestore(&trans->reg_lock, flags);
 }
 EXPORT_SYMBOL_GPL(iwl_write_prph);
 
@@ -141,13 +132,11 @@ void iwl_set_bits_prph(struct iwl_trans *trans, u32 ofs, u32 mask)
 {
         unsigned long flags;
 
-        spin_lock_irqsave(&trans->reg_lock, flags);
-        if (iwl_trans_grab_nic_access(trans, false)) {
+        if (iwl_trans_grab_nic_access(trans, false, &flags)) {
                 __iwl_write_prph(trans, ofs,
                                  __iwl_read_prph(trans, ofs) | mask);
-                iwl_trans_release_nic_access(trans);
+                iwl_trans_release_nic_access(trans, &flags);
         }
-        spin_unlock_irqrestore(&trans->reg_lock, flags);
 }
 EXPORT_SYMBOL_GPL(iwl_set_bits_prph);
 
@@ -156,13 +145,11 @@ void iwl_set_bits_mask_prph(struct iwl_trans *trans, u32 ofs,
 {
         unsigned long flags;
 
-        spin_lock_irqsave(&trans->reg_lock, flags);
-        if (iwl_trans_grab_nic_access(trans, false)) {
+        if (iwl_trans_grab_nic_access(trans, false, &flags)) {
                 __iwl_write_prph(trans, ofs,
                                  (__iwl_read_prph(trans, ofs) & mask) | bits);
-                iwl_trans_release_nic_access(trans);
+                iwl_trans_release_nic_access(trans, &flags);
         }
-        spin_unlock_irqrestore(&trans->reg_lock, flags);
 }
 EXPORT_SYMBOL_GPL(iwl_set_bits_mask_prph);
 
@@ -171,12 +158,10 @@ void iwl_clear_bits_prph(struct iwl_trans *trans, u32 ofs, u32 mask)
         unsigned long flags;
         u32 val;
 
-        spin_lock_irqsave(&trans->reg_lock, flags);
-        if (iwl_trans_grab_nic_access(trans, false)) {
+        if (iwl_trans_grab_nic_access(trans, false, &flags)) {
                 val = __iwl_read_prph(trans, ofs);
                 __iwl_write_prph(trans, ofs, (val & ~mask));
-                iwl_trans_release_nic_access(trans);
+                iwl_trans_release_nic_access(trans, &flags);
         }
-        spin_unlock_irqrestore(&trans->reg_lock, flags);
 }
 EXPORT_SYMBOL_GPL(iwl_clear_bits_prph);