aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/iwlwifi/iwl-drv.c
diff options
context:
space:
mode:
authorEmmanuel Grumbach <emmanuel.grumbach@intel.com>2012-04-19 03:29:58 -0400
committerJohn W. Linville <linville@tuxdriver.com>2012-05-08 20:56:09 -0400
commitc15797e6af9a26686a93d79e5bb6ce8280379e92 (patch)
treed2fd9354485c24fd3b227d0932aa3d193602eaee /drivers/net/wireless/iwlwifi/iwl-drv.c
parent4d5ba61ca3607dacd84a86c61bae7752e3dd9cae (diff)
iwlwifi: use IWL_* instead of dev_printk when possible
Also remove a debug print when allocation error occurred. The kernel will complain anyway. Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com> Signed-off-by: Wey-Yi Guy <wey-yi.w.guy@intel.com>
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl-drv.c')
-rw-r--r--drivers/net/wireless/iwlwifi/iwl-drv.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-drv.c b/drivers/net/wireless/iwlwifi/iwl-drv.c
index 05302d6f989f..430cca56a7e7 100644
--- a/drivers/net/wireless/iwlwifi/iwl-drv.c
+++ b/drivers/net/wireless/iwlwifi/iwl-drv.c
@@ -66,6 +66,7 @@
66#include <linux/module.h> 66#include <linux/module.h>
67 67
68#include "iwl-drv.h" 68#include "iwl-drv.h"
69#include "iwl-debug.h"
69#include "iwl-trans.h" 70#include "iwl-trans.h"
70#include "iwl-op-mode.h" 71#include "iwl-op-mode.h"
71#include "iwl-agn-hw.h" 72#include "iwl-agn-hw.h"
@@ -892,10 +893,9 @@ struct iwl_drv *iwl_drv_start(struct iwl_trans *trans,
892 int ret; 893 int ret;
893 894
894 drv = kzalloc(sizeof(*drv), GFP_KERNEL); 895 drv = kzalloc(sizeof(*drv), GFP_KERNEL);
895 if (!drv) { 896 if (!drv)
896 dev_printk(KERN_ERR, trans->dev, "Couldn't allocate iwl_drv");
897 return NULL; 897 return NULL;
898 } 898
899 drv->trans = trans; 899 drv->trans = trans;
900 drv->dev = trans->dev; 900 drv->dev = trans->dev;
901 drv->cfg = cfg; 901 drv->cfg = cfg;
@@ -905,7 +905,7 @@ struct iwl_drv *iwl_drv_start(struct iwl_trans *trans,
905 ret = iwl_request_firmware(drv, true); 905 ret = iwl_request_firmware(drv, true);
906 906
907 if (ret) { 907 if (ret) {
908 dev_printk(KERN_ERR, trans->dev, "Couldn't request the fw"); 908 IWL_ERR(trans, "Couldn't request the fw\n");
909 kfree(drv); 909 kfree(drv);
910 drv = NULL; 910 drv = NULL;
911 } 911 }