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>

1 files changed, 4 insertions, 2 deletions

diff --git a/drivers/net/wireless/iwlwifi/iwl-4965.c b/drivers/net/wireless/iwlwifi/iwl-4965.c
index 5a72bc0377de..bb9617092c4e 100644
--- a/drivers/net/wireless/iwlwifi/iwl-4965.c
+++ b/drivers/net/wireless/iwlwifi/iwl-4965.c
@@ -902,7 +902,6 @@ static s32 iwl4965_get_tx_atten_grp(u16 channel)
             channel <= CALIB_IWL_TX_ATTEN_GR4_LCH)
                 return CALIB_CH_GROUP_4;
 
-        IWL_ERROR("Can't find txatten group for channel %d.\n", channel);
         return -1;
 }
 
@@ -1319,8 +1318,11 @@ static int iwl4965_fill_txpower_tbl(struct iwl_priv *priv, u8 band, u16 channel,
         /* get txatten group, used to select 1) thermal txpower adjustment
          *   and 2) mimo txpower balance between Tx chains. */
         txatten_grp = iwl4965_get_tx_atten_grp(channel);
-        if (txatten_grp < 0)
+        if (txatten_grp < 0) {
+                IWL_ERROR("Can't find txatten group for channel %d.\n",
+                          channel);
                 return -EINVAL;
+        }
 
         IWL_DEBUG_TXPOWER("channel %d belongs to txatten group %d\n",
                           channel, txatten_grp);