Remove unneeded PCI compatibility code

[madwifi/.git] / ath / if_ath_hal_macros.h

diff --git a/ath/if_ath_hal_macros.h b/ath/if_ath_hal_macros.h
index a6c93240fb06f1eefd33e9acea32f53b4739724d..3a0c6436c529552457c2cd124a1079605414e53f 100644 (file)
--- a/ath/if_ath_hal_macros.h
+++ b/ath/if_ath_hal_macros.h
@@ -44,8 +44,8 @@
  * at build time.  i.e. inline for speed, or non-inline for debugging visibility
  * into the HAL methods being called (despite obfuscation).
  * 
- * The if_ath_hal.h file is generated from hal/ah.h at build time by the build
- * system.
+ * The if_ath_hal.h file is generated from ath_hal/ah.h at build time by the
+ * build system.
  */
 #ifndef _IF_ATH_HAL_MACROS_H_
 #define _IF_ATH_HAL_MACROS_H_
@@ -59,18 +59,18 @@
 #define ATH_HAL_UNLOCK_IRQ(_sc) \
    ATH_HAL_LOCK_ASSERT(_sc);                                      \
    spin_unlock_irqrestore(&(_sc)->sc_hal_lock, __sc_halLockflags); \
-   } while(0)
+   } while (0)
 #define ATH_HAL_UNLOCK_IRQ_EARLY(_sc) \
    ATH_HAL_LOCK_ASSERT(_sc);                                      \
    spin_unlock_irqrestore(&(_sc)->sc_hal_lock, __sc_halLockflags);
 
 #if (defined(CONFIG_SMP) || defined(CONFIG_DEBUG_SPINLOCK)) && defined(spin_is_locked)
 #define        ATH_HAL_LOCK_ASSERT(_sc) \
-       KASSERT(spin_is_locked(&(_sc)->sc_hal_lock), ("hal not locked!"))
+       KASSERT(spin_is_locked(&(_sc)->sc_hal_lock), ("HAL not locked!"))
 #if (defined(ATH_DEBUG_SPINLOCKS))
 #define        ATH_HAL_LOCK_CHECK(_sc) do { \
        if (spin_is_locked(&(_sc)->sc_hal_lock)) \
-               printk("%s:%d - about to block on hal lock!", __func__, __LINE__); \
+               IPRINTF(_sc, "About to block on HAL lock! [%s:%d]\n", __func__, __LINE__); \
 } while(0)
 #else /* #if (defined(ATH_DEBUG_SPINLOCKS)) */
 #define        ATH_HAL_LOCK_CHECK(_sc)
@@ -81,5 +81,4 @@
 #define        ATH_HAL_LOCK_CHECK(_sc)
 #endif
 
-
 #endif /* #ifndef _IF_ATH_HAL_MACROS_H_ */