aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/iwlwifi/iwl-debug.h
diff options
context:
space:
mode:
authorSamuel Ortiz <sameo@linux.intel.com>2008-12-18 21:37:09 -0500
committerJohn W. Linville <linville@tuxdriver.com>2009-01-29 15:58:56 -0500
commita3139c5956702c9ff957ac9fe2d902de355b063e (patch)
tree50df5afc7b5867b13421c6be19ff1e020c18c745 /drivers/net/wireless/iwlwifi/iwl-debug.h
parent40b8ec0bfa2d96c9feae2bc1596e9b427c77b8da (diff)
iwl3945: Remove DRV_NAME dependenies
As DRV_NAME is defined in 2 different header files, including both is not possible. This patch defines this constant from iwl3945-base.c and iwl-agn.c. It also redefines the IWL_ERROR and IWL_WARNING macros to use dev_printk, as the IWL_DEBUG_* macros do. Signed-off-by: Samuel Ortiz <samuel.ortiz@intel.com> Acked-by: Abhijeet Kolekar <abhijeet.kolekar@intel.com> Signed-off-by: Reinette Chatre <reinette.chatre@intel.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl-debug.h')
-rw-r--r--drivers/net/wireless/iwlwifi/iwl-debug.h6
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-debug.h b/drivers/net/wireless/iwlwifi/iwl-debug.h
index f98921880abf..9c209d635d5a 100644
--- a/drivers/net/wireless/iwlwifi/iwl-debug.h
+++ b/drivers/net/wireless/iwlwifi/iwl-debug.h
@@ -160,8 +160,10 @@ static inline void iwl_dbgfs_unregister(struct iwl_priv *priv)
160#define IWL_DL_TX_REPLY (1 << 30) 160#define IWL_DL_TX_REPLY (1 << 30)
161#define IWL_DL_QOS (1 << 31) 161#define IWL_DL_QOS (1 << 31)
162 162
163#define IWL_ERROR(f, a...) printk(KERN_ERR DRV_NAME ": " f, ## a) 163#define IWL_ERROR(f, a...) dev_printk(KERN_ERR, \
164#define IWL_WARNING(f, a...) printk(KERN_WARNING DRV_NAME ": " f, ## a) 164 &(priv->hw->wiphy->dev), f, ## a)
165#define IWL_WARNING(f, a...) dev_printk(KERN_WARNING, \
166 &(priv->hw->wiphy->dev), f, ## a)
165#define IWL_DEBUG_INFO(f, a...) IWL_DEBUG(IWL_DL_INFO, f, ## a) 167#define IWL_DEBUG_INFO(f, a...) IWL_DEBUG(IWL_DL_INFO, f, ## a)
166 168
167#define IWL_DEBUG_MAC80211(f, a...) IWL_DEBUG(IWL_DL_MAC80211, f, ## a) 169#define IWL_DEBUG_MAC80211(f, a...) IWL_DEBUG(IWL_DL_MAC80211, f, ## a)