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, 6 insertions, 3 deletions

diff --git a/drivers/net/wireless/iwlwifi/iwl-agn-rs.c b/drivers/net/wireless/iwlwifi/iwl-agn-rs.c
index 27f50471aed8..19dd9fd9c09a 100644
--- a/drivers/net/wireless/iwlwifi/iwl-agn-rs.c
+++ b/drivers/net/wireless/iwlwifi/iwl-agn-rs.c
@@ -475,7 +475,8 @@ static u32 rate_n_flags_from_tbl(struct iwl_scale_tbl_info *tbl,
 
         } else if (is_Ht(tbl->lq_type)) {
                 if (index > IWL_LAST_OFDM_RATE) {
-                        IWL_ERROR("invalid HT rate index %d\n", index);
+                        printk(KERN_ERR RS_NAME": Invalid HT rate index %d\n",
+                               index);
                         index = IWL_LAST_OFDM_RATE;
                 }
                 rate_n_flags = RATE_MCS_HT_MSK;
@@ -487,7 +488,8 @@ static u32 rate_n_flags_from_tbl(struct iwl_scale_tbl_info *tbl,
                 else
                         rate_n_flags |= iwl_rates[index].plcp_mimo3;
         } else {
-                IWL_ERROR("Invalid tbl->lq_type %d\n", tbl->lq_type);
+                printk(KERN_ERR RS_NAME": Invalid tbl->lq_type %d\n",
+                       tbl->lq_type);
         }
 
         rate_n_flags |= ((tbl->ant_type << RATE_MCS_ANT_POS) &
@@ -507,7 +509,8 @@ static u32 rate_n_flags_from_tbl(struct iwl_scale_tbl_info *tbl,
                         rate_n_flags |= RATE_MCS_GF_MSK;
                         if (is_siso(tbl->lq_type) && tbl->is_SGI) {
                                 rate_n_flags &= ~RATE_MCS_SGI_MSK;
-                                IWL_ERROR("GF was set with SGI:SISO\n");
+                                printk(KERN_ERR RS_NAME
+                                       ": GF was set with SGI:SISO\n");
                         }
                 }
         }