diff mbox

[OPW,kernel] staging:prism2sta:fixes for checkpatch.pl errors/warnings

Message ID 1394530808-15189-1-git-send-email-swetha.kanagala@gmail.com
State New, archived
Headers show

Commit Message

swetha.kanagala@gmail.com March 11, 2014, 9:40 a.m. UTC
From: swetha kanagala <swetha.kanagala@gmail.com>

This patch has fixes
1. to replace printk with netdev_err, netdev_warn, netdev_dbg or netdev_warn
2. to replace mem_cpy with ether_mem_cpy.
3. to other checkpatch.pl warnings and errors.

Signed-off-by: swetha kanagala <swetha.kanagala@gmail.com>
---
 drivers/staging/wlan-ng/prism2sta.c |  255 ++++++++++++++++++-----------------
 1 file changed, 135 insertions(+), 120 deletions(-)

Comments

Sarah Sharp March 13, 2014, 11:25 p.m. UTC | #1
Swetha, I think you need to change the .git/config file to read:

[user]
	name = Swetha Kanagala
	email = swetha.kanagala@gmail.com

The From line in your email doesn't match, so I wonder if that's the
cause.  If you fix that, and re-commit your messages with:

git commit amend --author="Swetha Kanagala <swetha.kanagala@gmail.com>"

Then you shouldn't need to add the From line in your patch body.

Sarah Sharp

On Tue, Mar 11, 2014 at 03:10:08PM +0530, swetha.kanagala@gmail.com wrote:
> From: swetha kanagala <swetha.kanagala@gmail.com>
> 
> This patch has fixes
> 1. to replace printk with netdev_err, netdev_warn, netdev_dbg or netdev_warn
> 2. to replace mem_cpy with ether_mem_cpy.
> 3. to other checkpatch.pl warnings and errors.
> 
> Signed-off-by: swetha kanagala <swetha.kanagala@gmail.com>
> ---
>  drivers/staging/wlan-ng/prism2sta.c |  255 ++++++++++++++++++-----------------
>  1 file changed, 135 insertions(+), 120 deletions(-)
> 
> diff --git a/drivers/staging/wlan-ng/prism2sta.c b/drivers/staging/wlan-ng/prism2sta.c
> index d1a8a94..bfe51a2 100644
> --- a/drivers/staging/wlan-ng/prism2sta.c
> +++ b/drivers/staging/wlan-ng/prism2sta.c
> @@ -67,6 +67,7 @@
>  #include <linux/if_arp.h>
>  #include <linux/if_ether.h>
>  #include <linux/bitops.h>
> +#include <linux/etherdevice.h>
>  
>  #include "p80211types.h"
>  #include "p80211hdr.h"
> @@ -313,46 +314,46 @@ static int prism2sta_mlmerequest(wlandevice_t *wlandev, struct p80211msg *msg)
>  
>  	switch (msg->msgcode) {
>  	case DIDmsg_dot11req_mibget:
> -		pr_debug("Received mibget request\n");
> +		netdev_dbg(wlandev->netdev, "Received mibget request\n");
>  		result = prism2mgmt_mibset_mibget(wlandev, msg);
>  		break;
>  	case DIDmsg_dot11req_mibset:
> -		pr_debug("Received mibset request\n");
> +		netdev_dbg(wlandev->netdev, "Received mibset request\n");
>  		result = prism2mgmt_mibset_mibget(wlandev, msg);
>  		break;
>  	case DIDmsg_dot11req_scan:
> -		pr_debug("Received scan request\n");
> +		netdev_dbg(wlandev->netdev, "Received scan request\n");
>  		result = prism2mgmt_scan(wlandev, msg);
>  		break;
>  	case DIDmsg_dot11req_scan_results:
> -		pr_debug("Received scan_results request\n");
> +		netdev_dbg(wlandev->netdev, "Received scan_results request\n");
>  		result = prism2mgmt_scan_results(wlandev, msg);
>  		break;
>  	case DIDmsg_dot11req_start:
> -		pr_debug("Received mlme start request\n");
> +		netdev_dbg(wlandev->netdev, "Received mlme start request\n");
>  		result = prism2mgmt_start(wlandev, msg);
>  		break;
>  		/*
>  		 * Prism2 specific messages
>  		 */
>  	case DIDmsg_p2req_readpda:
> -		pr_debug("Received mlme readpda request\n");
> +		netdev_dbg(wlandev->netdev, "Received mlme readpda request\n");
>  		result = prism2mgmt_readpda(wlandev, msg);
>  		break;
>  	case DIDmsg_p2req_ramdl_state:
> -		pr_debug("Received mlme ramdl_state request\n");
> +		netdev_dbg(wlandev->netdev, "Received mlme ramdl_state request\n");
>  		result = prism2mgmt_ramdl_state(wlandev, msg);
>  		break;
>  	case DIDmsg_p2req_ramdl_write:
> -		pr_debug("Received mlme ramdl_write request\n");
> +		netdev_dbg(wlandev->netdev, "Received mlme ramdl_write request\n");
>  		result = prism2mgmt_ramdl_write(wlandev, msg);
>  		break;
>  	case DIDmsg_p2req_flashdl_state:
> -		pr_debug("Received mlme flashdl_state request\n");
> +		netdev_dbg(wlandev->netdev, "Received mlme flashdl_state request\n");
>  		result = prism2mgmt_flashdl_state(wlandev, msg);
>  		break;
>  	case DIDmsg_p2req_flashdl_write:
> -		pr_debug("Received mlme flashdl_write request\n");
> +		netdev_dbg(wlandev->netdev, "Received mlme flashdl_write request\n");
>  		result = prism2mgmt_flashdl_write(wlandev, msg);
>  		break;
>  		/*
> @@ -363,7 +364,7 @@ static int prism2sta_mlmerequest(wlandevice_t *wlandev, struct p80211msg *msg)
>  	case DIDmsg_lnxreq_ifstate:
>  		{
>  			struct p80211msg_lnxreq_ifstate *ifstatemsg;
> -			pr_debug("Received mlme ifstate request\n");
> +			netdev_dbg(wlandev->netdev, "Received mlme ifstate request\n");
>  			ifstatemsg = (struct p80211msg_lnxreq_ifstate *) msg;
>  			result =
>  			    prism2sta_ifstate(wlandev,
> @@ -375,17 +376,17 @@ static int prism2sta_mlmerequest(wlandevice_t *wlandev, struct p80211msg *msg)
>  		}
>  		break;
>  	case DIDmsg_lnxreq_wlansniff:
> -		pr_debug("Received mlme wlansniff request\n");
> +		netdev_dbg(wlandev->netdev, "Received mlme wlansniff request\n");
>  		result = prism2mgmt_wlansniff(wlandev, msg);
>  		break;
>  	case DIDmsg_lnxreq_autojoin:
> -		pr_debug("Received mlme autojoin request\n");
> +		netdev_dbg(wlandev->netdev, "Received mlme autojoin request\n");
>  		result = prism2mgmt_autojoin(wlandev, msg);
>  		break;
>  	case DIDmsg_lnxreq_commsquality:{
>  			struct p80211msg_lnxreq_commsquality *qualmsg;
>  
> -			pr_debug("Received commsquality request\n");
> +			netdev_dbg(wlandev->netdev, "Received commsquality request\n");
>  
>  			qualmsg = (struct p80211msg_lnxreq_commsquality *) msg;
>  
> @@ -404,8 +405,8 @@ static int prism2sta_mlmerequest(wlandevice_t *wlandev, struct p80211msg *msg)
>  			break;
>  		}
>  	default:
> -		pr_warn("Unknown mgmt request message 0x%08x",
> -		       msg->msgcode);
> +		netdev_warn(wlandev->netdev
> +			, "Unknown mgmt request message 0x%08x", msg->msgcode);
>  		break;
>  	}
>  
> @@ -440,7 +441,7 @@ u32 prism2sta_ifstate(wlandevice_t *wlandev, u32 ifstate)
>  
>  	result = P80211ENUM_resultcode_implementation_failure;
>  
> -	pr_debug("Current MSD state(%d), requesting(%d)\n",
> +	netdev_dbg(wlandev->netdev, "Current MSD state(%d), requesting(%d)\n",
>  		 wlandev->msdstate, ifstate);
>  	switch (ifstate) {
>  	case P80211ENUM_ifstate_fwload:
> @@ -453,8 +454,9 @@ u32 prism2sta_ifstate(wlandevice_t *wlandev, u32 ifstate)
>  			 */
>  			result = hfa384x_drvr_start(hw);
>  			if (result) {
> -				pr_err("hfa384x_drvr_start() failed,"
> -				       "result=%d\n", (int)result);
> +				netdev_err(wlandev->netdev
> +				, "hfa384x_drvr_start() failed, result=%d\n"
> +				, (int)result);
>  				result =
>  				 P80211ENUM_resultcode_implementation_failure;
>  				wlandev->msdstate = WLAN_MSD_HWPRESENT;
> @@ -468,8 +470,8 @@ u32 prism2sta_ifstate(wlandevice_t *wlandev, u32 ifstate)
>  			result = P80211ENUM_resultcode_success;
>  			break;
>  		case WLAN_MSD_RUNNING:
> -			pr_warn("Cannot enter fwload state from enable state,"
> -			       "you must disable first.\n");
> +			netdev_warn(wlandev->netdev
> +, "Cannot enter fwload state from enable state, you must disable first.\n");
>  			result = P80211ENUM_resultcode_invalid_parameters;
>  			break;
>  		case WLAN_MSD_HWFAIL:
> @@ -496,8 +498,9 @@ u32 prism2sta_ifstate(wlandevice_t *wlandev, u32 ifstate)
>  			 */
>  			result = hfa384x_drvr_start(hw);
>  			if (result) {
> -				pr_err("hfa384x_drvr_start() failed,"
> -				       "result=%d\n", (int)result);
> +				netdev_err(wlandev->netdev,
> +				 "hfa384x_drvr_start() failed, result=%d\n"
> +				, (int)result);
>  				result =
>  				  P80211ENUM_resultcode_implementation_failure;
>  				wlandev->msdstate = WLAN_MSD_HWPRESENT;
> @@ -506,8 +509,9 @@ u32 prism2sta_ifstate(wlandevice_t *wlandev, u32 ifstate)
>  
>  			result = prism2sta_getcardinfo(wlandev);
>  			if (result) {
> -				pr_err("prism2sta_getcardinfo() failed,"
> -				       "result=%d\n", (int)result);
> +				netdev_err(wlandev->netdev
> +				, "prism2sta_getcardinfo() failed, result=%d\n"
> +				, (int)result);
>  				result =
>  				  P80211ENUM_resultcode_implementation_failure;
>  				hfa384x_drvr_stop(hw);
> @@ -516,8 +520,9 @@ u32 prism2sta_ifstate(wlandevice_t *wlandev, u32 ifstate)
>  			}
>  			result = prism2sta_globalsetup(wlandev);
>  			if (result) {
> -				pr_err("prism2sta_globalsetup() failed,"
> -				       "result=%d\n", (int)result);
> +				netdev_err(wlandev->netdev
> +				, "prism2sta_globalsetup() failed, result=%d\n"
> +				, (int)result);
>  				result =
>  				  P80211ENUM_resultcode_implementation_failure;
>  				hfa384x_drvr_stop(hw);
> @@ -617,7 +622,7 @@ static int prism2sta_getcardinfo(wlandevice_t *wlandev)
>  					&hw->ident_nic,
>  					sizeof(hfa384x_compident_t));
>  	if (result) {
> -		pr_err("Failed to retrieve NICIDENTITY\n");
> +		netdev_err(wlandev->netdev, "Failed to retrieve NICIDENTITY\n");
>  		goto failed;
>  	}
>  
> @@ -627,7 +632,7 @@ static int prism2sta_getcardinfo(wlandevice_t *wlandev)
>  	hw->ident_nic.major = le16_to_cpu(hw->ident_nic.major);
>  	hw->ident_nic.minor = le16_to_cpu(hw->ident_nic.minor);
>  
> -	printk(KERN_INFO "ident: nic h/w: id=0x%02x %d.%d.%d\n",
> +	netdev_info(wlandev->netdev, "ident: nic h/w: id=0x%02x %d.%d.%d\n",
>  	       hw->ident_nic.id, hw->ident_nic.major,
>  	       hw->ident_nic.minor, hw->ident_nic.variant);
>  
> @@ -636,7 +641,7 @@ static int prism2sta_getcardinfo(wlandevice_t *wlandev)
>  					&hw->ident_pri_fw,
>  					sizeof(hfa384x_compident_t));
>  	if (result) {
> -		pr_err("Failed to retrieve PRIIDENTITY\n");
> +		netdev_err(wlandev->netdev, "Failed to retrieve PRIIDENTITY\n");
>  		goto failed;
>  	}
>  
> @@ -646,7 +651,7 @@ static int prism2sta_getcardinfo(wlandevice_t *wlandev)
>  	hw->ident_pri_fw.major = le16_to_cpu(hw->ident_pri_fw.major);
>  	hw->ident_pri_fw.minor = le16_to_cpu(hw->ident_pri_fw.minor);
>  
> -	printk(KERN_INFO "ident: pri f/w: id=0x%02x %d.%d.%d\n",
> +	netdev_info(wlandev->netdev, "ident: pri f/w: id=0x%02x %d.%d.%d\n",
>  	       hw->ident_pri_fw.id, hw->ident_pri_fw.major,
>  	       hw->ident_pri_fw.minor, hw->ident_pri_fw.variant);
>  
> @@ -655,12 +660,12 @@ static int prism2sta_getcardinfo(wlandevice_t *wlandev)
>  					&hw->ident_sta_fw,
>  					sizeof(hfa384x_compident_t));
>  	if (result) {
> -		pr_err("Failed to retrieve STAIDENTITY\n");
> +		netdev_err(wlandev->netdev, "Failed to retrieve STAIDENTITY\n");
>  		goto failed;
>  	}
>  
>  	if (hw->ident_nic.id < 0x8000) {
> -		pr_err("FATAL: Card is not an Intersil Prism2/2.5/3\n");
> +		netdev_err(wlandev->netdev, "FATAL: Card is not an Intersil Prism2/2.5/3\n");
>  		result = -1;
>  		goto failed;
>  	}
> @@ -676,16 +681,16 @@ static int prism2sta_getcardinfo(wlandevice_t *wlandev)
>  	hw->ident_sta_fw.variant &= ~((u16) (BIT(14) | BIT(15)));
>  
>  	if (hw->ident_sta_fw.id == 0x1f) {
> -		printk(KERN_INFO
> -		       "ident: sta f/w: id=0x%02x %d.%d.%d\n",
> +		netdev_info(wlandev->netdev
> +		       , "ident: sta f/w: id=0x%02x %d.%d.%d\n",
>  		       hw->ident_sta_fw.id, hw->ident_sta_fw.major,
>  		       hw->ident_sta_fw.minor, hw->ident_sta_fw.variant);
>  	} else {
> -		printk(KERN_INFO
> -		       "ident:  ap f/w: id=0x%02x %d.%d.%d\n",
> +		netdev_info(wlandev->netdev
> +		       , "ident:  ap f/w: id=0x%02x %d.%d.%d\n",
>  		       hw->ident_sta_fw.id, hw->ident_sta_fw.major,
>  		       hw->ident_sta_fw.minor, hw->ident_sta_fw.variant);
> -		pr_err("Unsupported Tertiary AP firmeare loaded!\n");
> +		netdev_err(wlandev->netdev, "Unsupported Tertiary AP firmeare loaded!\n");
>  		goto failed;
>  	}
>  
> @@ -694,7 +699,7 @@ static int prism2sta_getcardinfo(wlandevice_t *wlandev)
>  					&hw->cap_sup_mfi,
>  					sizeof(hfa384x_caplevel_t));
>  	if (result) {
> -		pr_err("Failed to retrieve MFISUPRANGE\n");
> +		netdev_err(wlandev->netdev, "Failed to retrieve MFISUPRANGE\n");
>  		goto failed;
>  	}
>  
> @@ -706,8 +711,8 @@ static int prism2sta_getcardinfo(wlandevice_t *wlandev)
>  	hw->cap_sup_mfi.bottom = le16_to_cpu(hw->cap_sup_mfi.bottom);
>  	hw->cap_sup_mfi.top = le16_to_cpu(hw->cap_sup_mfi.top);
>  
> -	printk(KERN_INFO
> -	       "MFI:SUP:role=0x%02x:id=0x%02x:var=0x%02x:b/t=%d/%d\n",
> +	netdev_info(wlandev->netdev
> +	       , "MFI:SUP:role=0x%02x:id=0x%02x:var=0x%02x:b/t=%d/%d\n",
>  	       hw->cap_sup_mfi.role, hw->cap_sup_mfi.id,
>  	       hw->cap_sup_mfi.variant, hw->cap_sup_mfi.bottom,
>  	       hw->cap_sup_mfi.top);
> @@ -717,7 +722,7 @@ static int prism2sta_getcardinfo(wlandevice_t *wlandev)
>  					&hw->cap_sup_cfi,
>  					sizeof(hfa384x_caplevel_t));
>  	if (result) {
> -		pr_err("Failed to retrieve CFISUPRANGE\n");
> +		netdev_err(wlandev->netdev, "Failed to retrieve CFISUPRANGE\n");
>  		goto failed;
>  	}
>  
> @@ -729,8 +734,8 @@ static int prism2sta_getcardinfo(wlandevice_t *wlandev)
>  	hw->cap_sup_cfi.bottom = le16_to_cpu(hw->cap_sup_cfi.bottom);
>  	hw->cap_sup_cfi.top = le16_to_cpu(hw->cap_sup_cfi.top);
>  
> -	printk(KERN_INFO
> -	       "CFI:SUP:role=0x%02x:id=0x%02x:var=0x%02x:b/t=%d/%d\n",
> +	netdev_info(wlandev->netdev
> +	       , "CFI:SUP:role=0x%02x:id=0x%02x:var=0x%02x:b/t=%d/%d\n",
>  	       hw->cap_sup_cfi.role, hw->cap_sup_cfi.id,
>  	       hw->cap_sup_cfi.variant, hw->cap_sup_cfi.bottom,
>  	       hw->cap_sup_cfi.top);
> @@ -740,7 +745,7 @@ static int prism2sta_getcardinfo(wlandevice_t *wlandev)
>  					&hw->cap_sup_pri,
>  					sizeof(hfa384x_caplevel_t));
>  	if (result) {
> -		pr_err("Failed to retrieve PRISUPRANGE\n");
> +		netdev_err(wlandev->netdev, "Failed to retrieve PRISUPRANGE\n");
>  		goto failed;
>  	}
>  
> @@ -752,8 +757,8 @@ static int prism2sta_getcardinfo(wlandevice_t *wlandev)
>  	hw->cap_sup_pri.bottom = le16_to_cpu(hw->cap_sup_pri.bottom);
>  	hw->cap_sup_pri.top = le16_to_cpu(hw->cap_sup_pri.top);
>  
> -	printk(KERN_INFO
> -	       "PRI:SUP:role=0x%02x:id=0x%02x:var=0x%02x:b/t=%d/%d\n",
> +	netdev_info(wlandev->netdev
> +	       , "PRI:SUP:role=0x%02x:id=0x%02x:var=0x%02x:b/t=%d/%d\n",
>  	       hw->cap_sup_pri.role, hw->cap_sup_pri.id,
>  	       hw->cap_sup_pri.variant, hw->cap_sup_pri.bottom,
>  	       hw->cap_sup_pri.top);
> @@ -763,7 +768,7 @@ static int prism2sta_getcardinfo(wlandevice_t *wlandev)
>  					&hw->cap_sup_sta,
>  					sizeof(hfa384x_caplevel_t));
>  	if (result) {
> -		pr_err("Failed to retrieve STASUPRANGE\n");
> +		netdev_err(wlandev->netdev, "Failed to retrieve STASUPRANGE\n");
>  		goto failed;
>  	}
>  
> @@ -776,14 +781,14 @@ static int prism2sta_getcardinfo(wlandevice_t *wlandev)
>  	hw->cap_sup_sta.top = le16_to_cpu(hw->cap_sup_sta.top);
>  
>  	if (hw->cap_sup_sta.id == 0x04) {
> -		printk(KERN_INFO
> -		       "STA:SUP:role=0x%02x:id=0x%02x:var=0x%02x:b/t=%d/%d\n",
> +		netdev_info(wlandev->netdev
> +		       , "STA:SUP:role=0x%02x:id=0x%02x:var=0x%02x:b/t=%d/%d\n",
>  		       hw->cap_sup_sta.role, hw->cap_sup_sta.id,
>  		       hw->cap_sup_sta.variant, hw->cap_sup_sta.bottom,
>  		       hw->cap_sup_sta.top);
>  	} else {
> -		printk(KERN_INFO
> -		       "AP:SUP:role=0x%02x:id=0x%02x:var=0x%02x:b/t=%d/%d\n",
> +		netdev_info(wlandev->netdev
> +		       , "AP:SUP:role=0x%02x:id=0x%02x:var=0x%02x:b/t=%d/%d\n",
>  		       hw->cap_sup_sta.role, hw->cap_sup_sta.id,
>  		       hw->cap_sup_sta.variant, hw->cap_sup_sta.bottom,
>  		       hw->cap_sup_sta.top);
> @@ -794,7 +799,7 @@ static int prism2sta_getcardinfo(wlandevice_t *wlandev)
>  					&hw->cap_act_pri_cfi,
>  					sizeof(hfa384x_caplevel_t));
>  	if (result) {
> -		pr_err("Failed to retrieve PRI_CFIACTRANGES\n");
> +		netdev_err(wlandev->netdev, "Failed to retrieve PRI_CFIACTRANGES\n");
>  		goto failed;
>  	}
>  
> @@ -806,8 +811,8 @@ static int prism2sta_getcardinfo(wlandevice_t *wlandev)
>  	hw->cap_act_pri_cfi.bottom = le16_to_cpu(hw->cap_act_pri_cfi.bottom);
>  	hw->cap_act_pri_cfi.top = le16_to_cpu(hw->cap_act_pri_cfi.top);
>  
> -	printk(KERN_INFO
> -	       "PRI-CFI:ACT:role=0x%02x:id=0x%02x:var=0x%02x:b/t=%d/%d\n",
> +	netdev_info(wlandev->netdev
> +	       , "PRI-CFI:ACT:role=0x%02x:id=0x%02x:var=0x%02x:b/t=%d/%d\n",
>  	       hw->cap_act_pri_cfi.role, hw->cap_act_pri_cfi.id,
>  	       hw->cap_act_pri_cfi.variant, hw->cap_act_pri_cfi.bottom,
>  	       hw->cap_act_pri_cfi.top);
> @@ -817,7 +822,7 @@ static int prism2sta_getcardinfo(wlandevice_t *wlandev)
>  					&hw->cap_act_sta_cfi,
>  					sizeof(hfa384x_caplevel_t));
>  	if (result) {
> -		pr_err("Failed to retrieve STA_CFIACTRANGES\n");
> +		netdev_err(wlandev->netdev, "Failed to retrieve STA_CFIACTRANGES\n");
>  		goto failed;
>  	}
>  
> @@ -829,8 +834,8 @@ static int prism2sta_getcardinfo(wlandevice_t *wlandev)
>  	hw->cap_act_sta_cfi.bottom = le16_to_cpu(hw->cap_act_sta_cfi.bottom);
>  	hw->cap_act_sta_cfi.top = le16_to_cpu(hw->cap_act_sta_cfi.top);
>  
> -	printk(KERN_INFO
> -	       "STA-CFI:ACT:role=0x%02x:id=0x%02x:var=0x%02x:b/t=%d/%d\n",
> +	netdev_info(wlandev->netdev
> +	       , "STA-CFI:ACT:role=0x%02x:id=0x%02x:var=0x%02x:b/t=%d/%d\n",
>  	       hw->cap_act_sta_cfi.role, hw->cap_act_sta_cfi.id,
>  	       hw->cap_act_sta_cfi.variant, hw->cap_act_sta_cfi.bottom,
>  	       hw->cap_act_sta_cfi.top);
> @@ -840,7 +845,7 @@ static int prism2sta_getcardinfo(wlandevice_t *wlandev)
>  					&hw->cap_act_sta_mfi,
>  					sizeof(hfa384x_caplevel_t));
>  	if (result) {
> -		pr_err("Failed to retrieve STA_MFIACTRANGES\n");
> +		netdev_err(wlandev->netdev, "Failed to retrieve STA_MFIACTRANGES\n");
>  		goto failed;
>  	}
>  
> @@ -852,8 +857,8 @@ static int prism2sta_getcardinfo(wlandevice_t *wlandev)
>  	hw->cap_act_sta_mfi.bottom = le16_to_cpu(hw->cap_act_sta_mfi.bottom);
>  	hw->cap_act_sta_mfi.top = le16_to_cpu(hw->cap_act_sta_mfi.top);
>  
> -	printk(KERN_INFO
> -	       "STA-MFI:ACT:role=0x%02x:id=0x%02x:var=0x%02x:b/t=%d/%d\n",
> +	netdev_info(wlandev->netdev
> +	       , "STA-MFI:ACT:role=0x%02x:id=0x%02x:var=0x%02x:b/t=%d/%d\n",
>  	       hw->cap_act_sta_mfi.role, hw->cap_act_sta_mfi.id,
>  	       hw->cap_act_sta_mfi.variant, hw->cap_act_sta_mfi.bottom,
>  	       hw->cap_act_sta_mfi.top);
> @@ -864,9 +869,9 @@ static int prism2sta_getcardinfo(wlandevice_t *wlandev)
>  	if (!result) {
>  		wlan_mkprintstr(snum, HFA384x_RID_NICSERIALNUMBER_LEN,
>  				pstr, sizeof(pstr));
> -		printk(KERN_INFO "Prism2 card SN: %s\n", pstr);
> +		netdev_info(wlandev->netdev, "Prism2 card SN: %s\n", pstr);
>  	} else {
> -		pr_err("Failed to retrieve Prism2 Card SN\n");
> +		netdev_err(wlandev->netdev, "Failed to retrieve Prism2 Card SN\n");
>  		goto failed;
>  	}
>  
> @@ -874,7 +879,7 @@ static int prism2sta_getcardinfo(wlandevice_t *wlandev)
>  	result = hfa384x_drvr_getconfig(hw, HFA384x_RID_CNFOWNMACADDR,
>  					wlandev->netdev->dev_addr, ETH_ALEN);
>  	if (result != 0) {
> -		pr_err("Failed to retrieve mac address\n");
> +		netdev_err(wlandev->netdev, "Failed to retrieve mac address\n");
>  		goto failed;
>  	}
>  
> @@ -902,7 +907,7 @@ static int prism2sta_getcardinfo(wlandevice_t *wlandev)
>  
>  	goto done;
>  failed:
> -	pr_err("Failed, result=%d\n", result);
> +	netdev_err(wlandev->netdev, "Failed, result=%d\n", result);
>  done:
>  	return result;
>  }
> @@ -978,7 +983,7 @@ exit:
>  static void prism2sta_inf_handover(wlandevice_t *wlandev,
>  				   hfa384x_InfFrame_t *inf)
>  {
> -	pr_debug("received infoframe:HANDOVER (unhandled)\n");
> +	netdev_dbg(wlandev->netdev, "received infoframe:HANDOVER (unhandled)\n");
>  }
>  
>  /*----------------------------------------------------------------
> @@ -1061,14 +1066,15 @@ static void prism2sta_inf_scanresults(wlandevice_t *wlandev,
>  	nbss /= sizeof(hfa384x_ScanResultSub_t);
>  
>  	/* Print em */
> -	pr_debug("rx scanresults, reason=%d, nbss=%d:\n",
> +	netdev_dbg(wlandev->netdev, "rx scanresults, reason=%d, nbss=%d:\n",
>  		 inf->info.scanresult.scanreason, nbss);
>  	for (i = 0; i < nbss; i++) {
> -		pr_debug("chid=%d anl=%d sl=%d bcnint=%d\n",
> +		netdev_dbg(wlandev->netdev, "chid=%d anl=%d sl=%d bcnint=%d\n",
>  			 sr->result[i].chid,
>  			 sr->result[i].anl,
>  			 sr->result[i].sl, sr->result[i].bcnint);
> -		pr_debug("  capinfo=0x%04x proberesp_rate=%d\n",
> +		netdev_dbg(wlandev->netdev
> +			, "  capinfo=0x%04x proberesp_rate=%d\n",
>  			 sr->result[i].capinfo, sr->result[i].proberesp_rate);
>  	}
>  	/* issue a join request */
> @@ -1078,8 +1084,8 @@ static void prism2sta_inf_scanresults(wlandevice_t *wlandev,
>  					HFA384x_RID_JOINREQUEST,
>  					&joinreq, HFA384x_RID_JOINREQUEST_LEN);
>  	if (result) {
> -		pr_err("setconfig(joinreq) failed, result=%d\n",
> -		       result);
> +		netdev_err(wlandev->netdev
> +		, "setconfig(joinreq) failed, result=%d\n", result);
>  	}
>  }
>  
> @@ -1107,7 +1113,7 @@ static void prism2sta_inf_hostscanresults(wlandevice_t *wlandev,
>  	int nbss;
>  
>  	nbss = (inf->framelen - 3) / 32;
> -	pr_debug("Received %d hostscan results\n", nbss);
> +	netdev_dbg(wlandev->netdev, "Received %d hostscan results\n", nbss);
>  
>  	if (nbss > 32)
>  		nbss = 32;
> @@ -1170,7 +1176,8 @@ static void prism2sta_inf_chinforesults(wlandevice_t *wlandev,
>  		chinforesult->pnl = le16_to_cpu(result->pnl);
>  		chinforesult->active = le16_to_cpu(result->active);
>  
> -		pr_debug("chinfo: channel %d, %s level (avg/peak)=%d/%d dB, pcf %d\n",
> +		netdev_dbg(wlandev->netdev
> +		, "chinfo: channel %d, %s level (avg/peak)=%d/%d dB, pcf %d\n",
>  			 chan + 1,
>  			 (chinforesult->active & HFA384x_CHINFORESULT_BSSACTIVE)
>  				? "signal" : "noise",
> @@ -1219,7 +1226,8 @@ void prism2sta_processing_defer(struct work_struct *data)
>  		 */
>  		netif_carrier_off(wlandev->netdev);
>  
> -		printk(KERN_INFO "linkstatus=NOTCONNECTED (unhandled)\n");
> +		netdev_info(wlandev->netdev
> +		, "linkstatus=NOTCONNECTED (unhandled)\n");
>  		break;
>  
>  	case HFA384x_LINK_CONNECTED:
> @@ -1246,7 +1254,7 @@ void prism2sta_processing_defer(struct work_struct *data)
>  		if (wlandev->netdev->type == ARPHRD_ETHER) {
>  			u16 portstatus;
>  
> -			printk(KERN_INFO "linkstatus=CONNECTED\n");
> +			netdev_info(wlandev->netdev, "linkstatus=CONNECTED\n");
>  
>  			/* For non-usb devices, we can use the sync versions */
>  			/* Collect the BSSID, and set state to allow tx */
> @@ -1256,8 +1264,8 @@ void prism2sta_processing_defer(struct work_struct *data)
>  						wlandev->bssid,
>  						WLAN_BSSID_LEN);
>  			if (result) {
> -				pr_debug
> -				    ("getconfig(0x%02x) failed, result = %d\n",
> +				netdev_dbg(wlandev->netdev
> +				   , "getconfig(0x%02x) failed, result = %d\n",
>  				     HFA384x_RID_CURRENTBSSID, result);
>  				return;
>  			}
> @@ -1266,22 +1274,22 @@ void prism2sta_processing_defer(struct work_struct *data)
>  							HFA384x_RID_CURRENTSSID,
>  							&ssid, sizeof(ssid));
>  			if (result) {
> -				pr_debug
> -				    ("getconfig(0x%02x) failed, result = %d\n",
> +				netdev_dbg(wlandev->netdev
> +				    , "getconfig(0x%02x) failed, result = %d\n",
>  				     HFA384x_RID_CURRENTSSID, result);
>  				return;
>  			}
> -			prism2mgmt_bytestr2pstr((struct hfa384x_bytestr *) &ssid,
> -						(p80211pstrd_t *) &
> -						wlandev->ssid);
> +			prism2mgmt_bytestr2pstr(
> +					(struct hfa384x_bytestr *) &ssid,
> +					(p80211pstrd_t *) &wlandev->ssid);
>  
>  			/* Collect the port status */
>  			result = hfa384x_drvr_getconfig16(hw,
>  							HFA384x_RID_PORTSTATUS,
>  							&portstatus);
>  			if (result) {
> -				pr_debug
> -				    ("getconfig(0x%02x) failed, result = %d\n",
> +				netdev_dbg(wlandev->netdev
> +				, "getconfig(0x%02x) failed, result = %d\n",
>  				     HFA384x_RID_PORTSTATUS, result);
>  				return;
>  			}
> @@ -1308,8 +1316,8 @@ void prism2sta_processing_defer(struct work_struct *data)
>  		 * Block Transmits, Ignore receives of data frames
>  		 */
>  		if (wlandev->netdev->type == ARPHRD_ETHER)
> -			printk(KERN_INFO
> -			       "linkstatus=DISCONNECTED (unhandled)\n");
> +			netdev_info(wlandev->netdev
> +			       , "linkstatus=DISCONNECTED (unhandled)\n");
>  		wlandev->macmode = WLAN_MACMODE_NONE;
>  
>  		netif_carrier_off(wlandev->netdev);
> @@ -1334,13 +1342,13 @@ void prism2sta_processing_defer(struct work_struct *data)
>  		 * Indicate Reassociation
>  		 * Enable Transmits, Receives and pass up data frames
>  		 */
> -		printk(KERN_INFO "linkstatus=AP_CHANGE\n");
> +		netdev_info(wlandev->netdev, "linkstatus=AP_CHANGE\n");
>  
>  		result = hfa384x_drvr_getconfig(hw,
>  						HFA384x_RID_CURRENTBSSID,
>  						wlandev->bssid, WLAN_BSSID_LEN);
>  		if (result) {
> -			pr_debug("getconfig(0x%02x) failed, result = %d\n",
> +			netdev_dbg(wlandev->netdev, "getconfig(0x%02x) failed, result = %d\n",
>  				 HFA384x_RID_CURRENTBSSID, result);
>  			return;
>  		}
> @@ -1349,7 +1357,7 @@ void prism2sta_processing_defer(struct work_struct *data)
>  						HFA384x_RID_CURRENTSSID,
>  						&ssid, sizeof(ssid));
>  		if (result) {
> -			pr_debug("getconfig(0x%02x) failed, result = %d\n",
> +			netdev_dbg(wlandev->netdev, "getconfig(0x%02x) failed, result = %d\n",
>  				 HFA384x_RID_CURRENTSSID, result);
>  			return;
>  		}
> @@ -1376,7 +1384,7 @@ void prism2sta_processing_defer(struct work_struct *data)
>  		 * Response:
>  		 * Block Transmits, Ignore receives of data frames
>  		 */
> -		printk(KERN_INFO "linkstatus=AP_OUTOFRANGE (unhandled)\n");
> +		netdev_info(wlandev->netdev, "linkstatus=AP_OUTOFRANGE (unhandled)\n");
>  
>  		netif_carrier_off(wlandev->netdev);
>  
> @@ -1389,7 +1397,7 @@ void prism2sta_processing_defer(struct work_struct *data)
>  		 * Response:
>  		 * Enable Transmits, Receives and pass up data frames
>  		 */
> -		printk(KERN_INFO "linkstatus=AP_INRANGE\n");
> +		netdev_info(wlandev->netdev, "linkstatus=AP_INRANGE\n");
>  
>  		hw->link_status = HFA384x_LINK_CONNECTED;
>  		netif_carrier_on(wlandev->netdev);
> @@ -1413,10 +1421,10 @@ void prism2sta_processing_defer(struct work_struct *data)
>  					       HFA384x_RID_JOINREQUEST,
>  					       &joinreq,
>  					       HFA384x_RID_JOINREQUEST_LEN);
> -			printk(KERN_INFO
> -			       "linkstatus=ASSOCFAIL (re-submitting join)\n");
> +			netdev_info(wlandev->netdev
> +			       , "linkstatus=ASSOCFAIL (re-submitting join)\n");
>  		} else {
> -			printk(KERN_INFO "linkstatus=ASSOCFAIL (unhandled)\n");
> +			netdev_info(wlandev->netdev, "linkstatus=ASSOCFAIL (unhandled)\n");
>  		}
>  
>  		netif_carrier_off(wlandev->netdev);
> @@ -1428,7 +1436,8 @@ void prism2sta_processing_defer(struct work_struct *data)
>  
>  	default:
>  		/* This is bad, IO port problems? */
> -		pr_warn("unknown linkstatus=0x%02x\n", hw->link_status);
> +		netdev_warn(wlandev->netdev, "unknown linkstatus=0x%02x\n"
> +		, hw->link_status);
>  		return;
>  	}
>  
> @@ -1509,16 +1518,16 @@ static void prism2sta_inf_assocstatus(wlandevice_t *wlandev,
>  
>  	if (i >= hw->authlist.cnt) {
>  		if (rec.assocstatus != HFA384x_ASSOCSTATUS_AUTHFAIL)
> -			pr_warn(
> -	"assocstatus info frame received for non-authenticated station.\n");
> +			netdev_warn(wlandev->netdev
> +	, "assocstatus info frame received for non-authenticated station.\n");
>  	} else {
>  		hw->authlist.assoc[i] =
>  		    (rec.assocstatus == HFA384x_ASSOCSTATUS_STAASSOC ||
>  		     rec.assocstatus == HFA384x_ASSOCSTATUS_REASSOC);
>  
>  		if (rec.assocstatus == HFA384x_ASSOCSTATUS_AUTHFAIL)
> -			pr_warn(
> -"authfail assocstatus info frame received for authenticated station.\n");
> +			netdev_warn(wlandev->netdev
> +, "authfail assocstatus info frame received for authenticated station.\n");
>  	}
>  }
>  
> @@ -1570,7 +1579,7 @@ static void prism2sta_inf_authreq_defer(wlandevice_t *wlandev,
>  	 ** authentication.
>  	 */
>  
> -	memcpy(rec.address, inf->info.authreq.sta_addr, ETH_ALEN);
> +	ether_addr_copy(rec.address, inf->info.authreq.sta_addr);
>  	rec.status = P80211ENUM_status_unspec_failure;
>  
>  	/*
> @@ -1705,7 +1714,7 @@ static void prism2sta_inf_authreq_defer(wlandevice_t *wlandev,
>  	if (result) {
>  		if (added)
>  			hw->authlist.cnt--;
> -		pr_err("setconfig(authenticatestation) failed, result=%d\n",
> +		netdev_err(wlandev->netdev, "setconfig(authenticatestation) failed, result=%d\n",
>  		       result);
>  	}
>  }
> @@ -1786,16 +1795,17 @@ void prism2sta_ev_info(wlandevice_t *wlandev, hfa384x_InfFrame_t *inf)
>  		prism2sta_inf_psusercnt(wlandev, inf);
>  		break;
>  	case HFA384x_IT_KEYIDCHANGED:
> -		pr_warn("Unhandled IT_KEYIDCHANGED\n");
> +		netdev_warn(wlandev->netdev, "Unhandled IT_KEYIDCHANGED\n");
>  		break;
>  	case HFA384x_IT_ASSOCREQ:
> -		pr_warn("Unhandled IT_ASSOCREQ\n");
> +		netdev_warn(wlandev->netdev, "Unhandled IT_ASSOCREQ\n");
>  		break;
>  	case HFA384x_IT_MICFAILURE:
> -		pr_warn("Unhandled IT_MICFAILURE\n");
> +		netdev_warn(wlandev->netdev, "Unhandled IT_MICFAILURE\n");
>  		break;
>  	default:
> -		pr_warn("Unknown info type=0x%02x\n", inf->infotype);
> +		netdev_warn(wlandev->netdev, "Unknown info type=0x%02x\n",
> +				 inf->infotype);
>  		break;
>  	}
>  }
> @@ -1821,7 +1831,7 @@ void prism2sta_ev_info(wlandevice_t *wlandev, hfa384x_InfFrame_t *inf)
>  ----------------------------------------------------------------*/
>  void prism2sta_ev_txexc(wlandevice_t *wlandev, u16 status)
>  {
> -	pr_debug("TxExc status=0x%x.\n", status);
> +	netdev_dbg(wlandev->netdev, "TxExc status=0x%x.\n", status);
>  }
>  
>  /*----------------------------------------------------------------
> @@ -1842,7 +1852,7 @@ void prism2sta_ev_txexc(wlandevice_t *wlandev, u16 status)
>  ----------------------------------------------------------------*/
>  void prism2sta_ev_tx(wlandevice_t *wlandev, u16 status)
>  {
> -	pr_debug("Tx Complete, status=0x%04x\n", status);
> +	netdev_dbg(wlandev->netdev, "Tx Complete, status=0x%04x\n", status);
>  	/* update linux network stats */
>  	wlandev->linux_stats.tx_packets++;
>  }
> @@ -1918,7 +1928,8 @@ static wlandevice_t *create_wlan(void)
>  	hw = kzalloc(sizeof(hfa384x_t), GFP_KERNEL);
>  
>  	if (!wlandev || !hw) {
> -		pr_err("%s: Memory allocation failure.\n", dev_info);
> +		netdev_err(wlandev->netdev, "%s: Memory allocation failure.\n",
> +				 dev_info);
>  		kfree(wlandev);
>  		kfree(hw);
>  		return NULL;
> @@ -1970,14 +1981,15 @@ void prism2sta_commsqual_defer(struct work_struct *data)
>  				&hw->qual, HFA384x_RID_DBMCOMMSQUALITY_LEN);
>  
>  		if (result) {
> -			pr_err("error fetching commsqual\n");
> +			netdev_err(wlandev->netdev
> +				, "error fetching commsqual\n");
>  			return;
>  		}
>  
> -		pr_debug("commsqual %d %d %d\n",
> -			 le16_to_cpu(hw->qual.CQ_currBSS),
> -			 le16_to_cpu(hw->qual.ASL_currBSS),
> -			 le16_to_cpu(hw->qual.ANL_currFC));
> +		netdev_dbg(wlandev->netdev, "commsqual %d %d %d\n"
> +			 , le16_to_cpu(hw->qual.CQ_currBSS)
> +			 ,  le16_to_cpu(hw->qual.ASL_currBSS)
> +			 , le16_to_cpu(hw->qual.ANL_currFC));
>  	}
>  
>  	/* Get the signal rate */
> @@ -1986,8 +1998,8 @@ void prism2sta_commsqual_defer(struct work_struct *data)
>  	result = p80211req_dorequest(wlandev, (u8 *) &msg);
>  
>  	if (result) {
> -		pr_debug("get signal rate failed, result = %d\n",
> -			 result);
> +		netdev_dbg(wlandev->netdev
> +			, "get signal rate failed, result = %d\n", result);
>  		return;
>  	}
>  
> @@ -2005,7 +2017,8 @@ void prism2sta_commsqual_defer(struct work_struct *data)
>  		hw->txrate = 110;
>  		break;
>  	default:
> -		pr_debug("Bad ratebit (%d)\n", mibitem->data);
> +		netdev_dbg(wlandev->netdev, "Bad ratebit (%d)\n"
> +				, mibitem->data);
>  	}
>  
>  	/* Lastly, we need to make sure the BSSID didn't change on us */
> @@ -2013,8 +2026,9 @@ void prism2sta_commsqual_defer(struct work_struct *data)
>  					HFA384x_RID_CURRENTBSSID,
>  					wlandev->bssid, WLAN_BSSID_LEN);
>  	if (result) {
> -		pr_debug("getconfig(0x%02x) failed, result = %d\n",
> -			 HFA384x_RID_CURRENTBSSID, result);
> +		netdev_dbg(wlandev->netdev
> +				 , "getconfig(0x%02x) failed, result = %d\n",
> +				 HFA384x_RID_CURRENTBSSID, result);
>  		return;
>  	}
>  
> @@ -2022,8 +2036,9 @@ void prism2sta_commsqual_defer(struct work_struct *data)
>  					HFA384x_RID_CURRENTSSID,
>  					&ssid, sizeof(ssid));
>  	if (result) {
> -		pr_debug("getconfig(0x%02x) failed, result = %d\n",
> -			 HFA384x_RID_CURRENTSSID, result);
> +		netdev_dbg(wlandev->netdev
> +		, "getconfig(0x%02x) failed,result = %d\n"
> +		, HFA384x_RID_CURRENTSSID, result);
>  		return;
>  	}
>  	prism2mgmt_bytestr2pstr((struct hfa384x_bytestr *) &ssid,
> -- 
> 1.7.9.5
> 
> revised the patch with the comments by julia, pablo and sarah.
> 
> -- 
> You received this message because you are subscribed to the Google Groups "opw-kernel" group.
> To unsubscribe from this group and stop receiving emails from it, send an email to opw-kernel+unsubscribe@googlegroups.com.
> For more options, visit https://groups.google.com/d/optout.
diff mbox

Patch

diff --git a/drivers/staging/wlan-ng/prism2sta.c b/drivers/staging/wlan-ng/prism2sta.c
index d1a8a94..bfe51a2 100644
--- a/drivers/staging/wlan-ng/prism2sta.c
+++ b/drivers/staging/wlan-ng/prism2sta.c
@@ -67,6 +67,7 @@ 
 #include <linux/if_arp.h>
 #include <linux/if_ether.h>
 #include <linux/bitops.h>
+#include <linux/etherdevice.h>
 
 #include "p80211types.h"
 #include "p80211hdr.h"
@@ -313,46 +314,46 @@  static int prism2sta_mlmerequest(wlandevice_t *wlandev, struct p80211msg *msg)
 
 	switch (msg->msgcode) {
 	case DIDmsg_dot11req_mibget:
-		pr_debug("Received mibget request\n");
+		netdev_dbg(wlandev->netdev, "Received mibget request\n");
 		result = prism2mgmt_mibset_mibget(wlandev, msg);
 		break;
 	case DIDmsg_dot11req_mibset:
-		pr_debug("Received mibset request\n");
+		netdev_dbg(wlandev->netdev, "Received mibset request\n");
 		result = prism2mgmt_mibset_mibget(wlandev, msg);
 		break;
 	case DIDmsg_dot11req_scan:
-		pr_debug("Received scan request\n");
+		netdev_dbg(wlandev->netdev, "Received scan request\n");
 		result = prism2mgmt_scan(wlandev, msg);
 		break;
 	case DIDmsg_dot11req_scan_results:
-		pr_debug("Received scan_results request\n");
+		netdev_dbg(wlandev->netdev, "Received scan_results request\n");
 		result = prism2mgmt_scan_results(wlandev, msg);
 		break;
 	case DIDmsg_dot11req_start:
-		pr_debug("Received mlme start request\n");
+		netdev_dbg(wlandev->netdev, "Received mlme start request\n");
 		result = prism2mgmt_start(wlandev, msg);
 		break;
 		/*
 		 * Prism2 specific messages
 		 */
 	case DIDmsg_p2req_readpda:
-		pr_debug("Received mlme readpda request\n");
+		netdev_dbg(wlandev->netdev, "Received mlme readpda request\n");
 		result = prism2mgmt_readpda(wlandev, msg);
 		break;
 	case DIDmsg_p2req_ramdl_state:
-		pr_debug("Received mlme ramdl_state request\n");
+		netdev_dbg(wlandev->netdev, "Received mlme ramdl_state request\n");
 		result = prism2mgmt_ramdl_state(wlandev, msg);
 		break;
 	case DIDmsg_p2req_ramdl_write:
-		pr_debug("Received mlme ramdl_write request\n");
+		netdev_dbg(wlandev->netdev, "Received mlme ramdl_write request\n");
 		result = prism2mgmt_ramdl_write(wlandev, msg);
 		break;
 	case DIDmsg_p2req_flashdl_state:
-		pr_debug("Received mlme flashdl_state request\n");
+		netdev_dbg(wlandev->netdev, "Received mlme flashdl_state request\n");
 		result = prism2mgmt_flashdl_state(wlandev, msg);
 		break;
 	case DIDmsg_p2req_flashdl_write:
-		pr_debug("Received mlme flashdl_write request\n");
+		netdev_dbg(wlandev->netdev, "Received mlme flashdl_write request\n");
 		result = prism2mgmt_flashdl_write(wlandev, msg);
 		break;
 		/*
@@ -363,7 +364,7 @@  static int prism2sta_mlmerequest(wlandevice_t *wlandev, struct p80211msg *msg)
 	case DIDmsg_lnxreq_ifstate:
 		{
 			struct p80211msg_lnxreq_ifstate *ifstatemsg;
-			pr_debug("Received mlme ifstate request\n");
+			netdev_dbg(wlandev->netdev, "Received mlme ifstate request\n");
 			ifstatemsg = (struct p80211msg_lnxreq_ifstate *) msg;
 			result =
 			    prism2sta_ifstate(wlandev,
@@ -375,17 +376,17 @@  static int prism2sta_mlmerequest(wlandevice_t *wlandev, struct p80211msg *msg)
 		}
 		break;
 	case DIDmsg_lnxreq_wlansniff:
-		pr_debug("Received mlme wlansniff request\n");
+		netdev_dbg(wlandev->netdev, "Received mlme wlansniff request\n");
 		result = prism2mgmt_wlansniff(wlandev, msg);
 		break;
 	case DIDmsg_lnxreq_autojoin:
-		pr_debug("Received mlme autojoin request\n");
+		netdev_dbg(wlandev->netdev, "Received mlme autojoin request\n");
 		result = prism2mgmt_autojoin(wlandev, msg);
 		break;
 	case DIDmsg_lnxreq_commsquality:{
 			struct p80211msg_lnxreq_commsquality *qualmsg;
 
-			pr_debug("Received commsquality request\n");
+			netdev_dbg(wlandev->netdev, "Received commsquality request\n");
 
 			qualmsg = (struct p80211msg_lnxreq_commsquality *) msg;
 
@@ -404,8 +405,8 @@  static int prism2sta_mlmerequest(wlandevice_t *wlandev, struct p80211msg *msg)
 			break;
 		}
 	default:
-		pr_warn("Unknown mgmt request message 0x%08x",
-		       msg->msgcode);
+		netdev_warn(wlandev->netdev
+			, "Unknown mgmt request message 0x%08x", msg->msgcode);
 		break;
 	}
 
@@ -440,7 +441,7 @@  u32 prism2sta_ifstate(wlandevice_t *wlandev, u32 ifstate)
 
 	result = P80211ENUM_resultcode_implementation_failure;
 
-	pr_debug("Current MSD state(%d), requesting(%d)\n",
+	netdev_dbg(wlandev->netdev, "Current MSD state(%d), requesting(%d)\n",
 		 wlandev->msdstate, ifstate);
 	switch (ifstate) {
 	case P80211ENUM_ifstate_fwload:
@@ -453,8 +454,9 @@  u32 prism2sta_ifstate(wlandevice_t *wlandev, u32 ifstate)
 			 */
 			result = hfa384x_drvr_start(hw);
 			if (result) {
-				pr_err("hfa384x_drvr_start() failed,"
-				       "result=%d\n", (int)result);
+				netdev_err(wlandev->netdev
+				, "hfa384x_drvr_start() failed, result=%d\n"
+				, (int)result);
 				result =
 				 P80211ENUM_resultcode_implementation_failure;
 				wlandev->msdstate = WLAN_MSD_HWPRESENT;
@@ -468,8 +470,8 @@  u32 prism2sta_ifstate(wlandevice_t *wlandev, u32 ifstate)
 			result = P80211ENUM_resultcode_success;
 			break;
 		case WLAN_MSD_RUNNING:
-			pr_warn("Cannot enter fwload state from enable state,"
-			       "you must disable first.\n");
+			netdev_warn(wlandev->netdev
+, "Cannot enter fwload state from enable state, you must disable first.\n");
 			result = P80211ENUM_resultcode_invalid_parameters;
 			break;
 		case WLAN_MSD_HWFAIL:
@@ -496,8 +498,9 @@  u32 prism2sta_ifstate(wlandevice_t *wlandev, u32 ifstate)
 			 */
 			result = hfa384x_drvr_start(hw);
 			if (result) {
-				pr_err("hfa384x_drvr_start() failed,"
-				       "result=%d\n", (int)result);
+				netdev_err(wlandev->netdev,
+				 "hfa384x_drvr_start() failed, result=%d\n"
+				, (int)result);
 				result =
 				  P80211ENUM_resultcode_implementation_failure;
 				wlandev->msdstate = WLAN_MSD_HWPRESENT;
@@ -506,8 +509,9 @@  u32 prism2sta_ifstate(wlandevice_t *wlandev, u32 ifstate)
 
 			result = prism2sta_getcardinfo(wlandev);
 			if (result) {
-				pr_err("prism2sta_getcardinfo() failed,"
-				       "result=%d\n", (int)result);
+				netdev_err(wlandev->netdev
+				, "prism2sta_getcardinfo() failed, result=%d\n"
+				, (int)result);
 				result =
 				  P80211ENUM_resultcode_implementation_failure;
 				hfa384x_drvr_stop(hw);
@@ -516,8 +520,9 @@  u32 prism2sta_ifstate(wlandevice_t *wlandev, u32 ifstate)
 			}
 			result = prism2sta_globalsetup(wlandev);
 			if (result) {
-				pr_err("prism2sta_globalsetup() failed,"
-				       "result=%d\n", (int)result);
+				netdev_err(wlandev->netdev
+				, "prism2sta_globalsetup() failed, result=%d\n"
+				, (int)result);
 				result =
 				  P80211ENUM_resultcode_implementation_failure;
 				hfa384x_drvr_stop(hw);
@@ -617,7 +622,7 @@  static int prism2sta_getcardinfo(wlandevice_t *wlandev)
 					&hw->ident_nic,
 					sizeof(hfa384x_compident_t));
 	if (result) {
-		pr_err("Failed to retrieve NICIDENTITY\n");
+		netdev_err(wlandev->netdev, "Failed to retrieve NICIDENTITY\n");
 		goto failed;
 	}
 
@@ -627,7 +632,7 @@  static int prism2sta_getcardinfo(wlandevice_t *wlandev)
 	hw->ident_nic.major = le16_to_cpu(hw->ident_nic.major);
 	hw->ident_nic.minor = le16_to_cpu(hw->ident_nic.minor);
 
-	printk(KERN_INFO "ident: nic h/w: id=0x%02x %d.%d.%d\n",
+	netdev_info(wlandev->netdev, "ident: nic h/w: id=0x%02x %d.%d.%d\n",
 	       hw->ident_nic.id, hw->ident_nic.major,
 	       hw->ident_nic.minor, hw->ident_nic.variant);
 
@@ -636,7 +641,7 @@  static int prism2sta_getcardinfo(wlandevice_t *wlandev)
 					&hw->ident_pri_fw,
 					sizeof(hfa384x_compident_t));
 	if (result) {
-		pr_err("Failed to retrieve PRIIDENTITY\n");
+		netdev_err(wlandev->netdev, "Failed to retrieve PRIIDENTITY\n");
 		goto failed;
 	}
 
@@ -646,7 +651,7 @@  static int prism2sta_getcardinfo(wlandevice_t *wlandev)
 	hw->ident_pri_fw.major = le16_to_cpu(hw->ident_pri_fw.major);
 	hw->ident_pri_fw.minor = le16_to_cpu(hw->ident_pri_fw.minor);
 
-	printk(KERN_INFO "ident: pri f/w: id=0x%02x %d.%d.%d\n",
+	netdev_info(wlandev->netdev, "ident: pri f/w: id=0x%02x %d.%d.%d\n",
 	       hw->ident_pri_fw.id, hw->ident_pri_fw.major,
 	       hw->ident_pri_fw.minor, hw->ident_pri_fw.variant);
 
@@ -655,12 +660,12 @@  static int prism2sta_getcardinfo(wlandevice_t *wlandev)
 					&hw->ident_sta_fw,
 					sizeof(hfa384x_compident_t));
 	if (result) {
-		pr_err("Failed to retrieve STAIDENTITY\n");
+		netdev_err(wlandev->netdev, "Failed to retrieve STAIDENTITY\n");
 		goto failed;
 	}
 
 	if (hw->ident_nic.id < 0x8000) {
-		pr_err("FATAL: Card is not an Intersil Prism2/2.5/3\n");
+		netdev_err(wlandev->netdev, "FATAL: Card is not an Intersil Prism2/2.5/3\n");
 		result = -1;
 		goto failed;
 	}
@@ -676,16 +681,16 @@  static int prism2sta_getcardinfo(wlandevice_t *wlandev)
 	hw->ident_sta_fw.variant &= ~((u16) (BIT(14) | BIT(15)));
 
 	if (hw->ident_sta_fw.id == 0x1f) {
-		printk(KERN_INFO
-		       "ident: sta f/w: id=0x%02x %d.%d.%d\n",
+		netdev_info(wlandev->netdev
+		       , "ident: sta f/w: id=0x%02x %d.%d.%d\n",
 		       hw->ident_sta_fw.id, hw->ident_sta_fw.major,
 		       hw->ident_sta_fw.minor, hw->ident_sta_fw.variant);
 	} else {
-		printk(KERN_INFO
-		       "ident:  ap f/w: id=0x%02x %d.%d.%d\n",
+		netdev_info(wlandev->netdev
+		       , "ident:  ap f/w: id=0x%02x %d.%d.%d\n",
 		       hw->ident_sta_fw.id, hw->ident_sta_fw.major,
 		       hw->ident_sta_fw.minor, hw->ident_sta_fw.variant);
-		pr_err("Unsupported Tertiary AP firmeare loaded!\n");
+		netdev_err(wlandev->netdev, "Unsupported Tertiary AP firmeare loaded!\n");
 		goto failed;
 	}
 
@@ -694,7 +699,7 @@  static int prism2sta_getcardinfo(wlandevice_t *wlandev)
 					&hw->cap_sup_mfi,
 					sizeof(hfa384x_caplevel_t));
 	if (result) {
-		pr_err("Failed to retrieve MFISUPRANGE\n");
+		netdev_err(wlandev->netdev, "Failed to retrieve MFISUPRANGE\n");
 		goto failed;
 	}
 
@@ -706,8 +711,8 @@  static int prism2sta_getcardinfo(wlandevice_t *wlandev)
 	hw->cap_sup_mfi.bottom = le16_to_cpu(hw->cap_sup_mfi.bottom);
 	hw->cap_sup_mfi.top = le16_to_cpu(hw->cap_sup_mfi.top);
 
-	printk(KERN_INFO
-	       "MFI:SUP:role=0x%02x:id=0x%02x:var=0x%02x:b/t=%d/%d\n",
+	netdev_info(wlandev->netdev
+	       , "MFI:SUP:role=0x%02x:id=0x%02x:var=0x%02x:b/t=%d/%d\n",
 	       hw->cap_sup_mfi.role, hw->cap_sup_mfi.id,
 	       hw->cap_sup_mfi.variant, hw->cap_sup_mfi.bottom,
 	       hw->cap_sup_mfi.top);
@@ -717,7 +722,7 @@  static int prism2sta_getcardinfo(wlandevice_t *wlandev)
 					&hw->cap_sup_cfi,
 					sizeof(hfa384x_caplevel_t));
 	if (result) {
-		pr_err("Failed to retrieve CFISUPRANGE\n");
+		netdev_err(wlandev->netdev, "Failed to retrieve CFISUPRANGE\n");
 		goto failed;
 	}
 
@@ -729,8 +734,8 @@  static int prism2sta_getcardinfo(wlandevice_t *wlandev)
 	hw->cap_sup_cfi.bottom = le16_to_cpu(hw->cap_sup_cfi.bottom);
 	hw->cap_sup_cfi.top = le16_to_cpu(hw->cap_sup_cfi.top);
 
-	printk(KERN_INFO
-	       "CFI:SUP:role=0x%02x:id=0x%02x:var=0x%02x:b/t=%d/%d\n",
+	netdev_info(wlandev->netdev
+	       , "CFI:SUP:role=0x%02x:id=0x%02x:var=0x%02x:b/t=%d/%d\n",
 	       hw->cap_sup_cfi.role, hw->cap_sup_cfi.id,
 	       hw->cap_sup_cfi.variant, hw->cap_sup_cfi.bottom,
 	       hw->cap_sup_cfi.top);
@@ -740,7 +745,7 @@  static int prism2sta_getcardinfo(wlandevice_t *wlandev)
 					&hw->cap_sup_pri,
 					sizeof(hfa384x_caplevel_t));
 	if (result) {
-		pr_err("Failed to retrieve PRISUPRANGE\n");
+		netdev_err(wlandev->netdev, "Failed to retrieve PRISUPRANGE\n");
 		goto failed;
 	}
 
@@ -752,8 +757,8 @@  static int prism2sta_getcardinfo(wlandevice_t *wlandev)
 	hw->cap_sup_pri.bottom = le16_to_cpu(hw->cap_sup_pri.bottom);
 	hw->cap_sup_pri.top = le16_to_cpu(hw->cap_sup_pri.top);
 
-	printk(KERN_INFO
-	       "PRI:SUP:role=0x%02x:id=0x%02x:var=0x%02x:b/t=%d/%d\n",
+	netdev_info(wlandev->netdev
+	       , "PRI:SUP:role=0x%02x:id=0x%02x:var=0x%02x:b/t=%d/%d\n",
 	       hw->cap_sup_pri.role, hw->cap_sup_pri.id,
 	       hw->cap_sup_pri.variant, hw->cap_sup_pri.bottom,
 	       hw->cap_sup_pri.top);
@@ -763,7 +768,7 @@  static int prism2sta_getcardinfo(wlandevice_t *wlandev)
 					&hw->cap_sup_sta,
 					sizeof(hfa384x_caplevel_t));
 	if (result) {
-		pr_err("Failed to retrieve STASUPRANGE\n");
+		netdev_err(wlandev->netdev, "Failed to retrieve STASUPRANGE\n");
 		goto failed;
 	}
 
@@ -776,14 +781,14 @@  static int prism2sta_getcardinfo(wlandevice_t *wlandev)
 	hw->cap_sup_sta.top = le16_to_cpu(hw->cap_sup_sta.top);
 
 	if (hw->cap_sup_sta.id == 0x04) {
-		printk(KERN_INFO
-		       "STA:SUP:role=0x%02x:id=0x%02x:var=0x%02x:b/t=%d/%d\n",
+		netdev_info(wlandev->netdev
+		       , "STA:SUP:role=0x%02x:id=0x%02x:var=0x%02x:b/t=%d/%d\n",
 		       hw->cap_sup_sta.role, hw->cap_sup_sta.id,
 		       hw->cap_sup_sta.variant, hw->cap_sup_sta.bottom,
 		       hw->cap_sup_sta.top);
 	} else {
-		printk(KERN_INFO
-		       "AP:SUP:role=0x%02x:id=0x%02x:var=0x%02x:b/t=%d/%d\n",
+		netdev_info(wlandev->netdev
+		       , "AP:SUP:role=0x%02x:id=0x%02x:var=0x%02x:b/t=%d/%d\n",
 		       hw->cap_sup_sta.role, hw->cap_sup_sta.id,
 		       hw->cap_sup_sta.variant, hw->cap_sup_sta.bottom,
 		       hw->cap_sup_sta.top);
@@ -794,7 +799,7 @@  static int prism2sta_getcardinfo(wlandevice_t *wlandev)
 					&hw->cap_act_pri_cfi,
 					sizeof(hfa384x_caplevel_t));
 	if (result) {
-		pr_err("Failed to retrieve PRI_CFIACTRANGES\n");
+		netdev_err(wlandev->netdev, "Failed to retrieve PRI_CFIACTRANGES\n");
 		goto failed;
 	}
 
@@ -806,8 +811,8 @@  static int prism2sta_getcardinfo(wlandevice_t *wlandev)
 	hw->cap_act_pri_cfi.bottom = le16_to_cpu(hw->cap_act_pri_cfi.bottom);
 	hw->cap_act_pri_cfi.top = le16_to_cpu(hw->cap_act_pri_cfi.top);
 
-	printk(KERN_INFO
-	       "PRI-CFI:ACT:role=0x%02x:id=0x%02x:var=0x%02x:b/t=%d/%d\n",
+	netdev_info(wlandev->netdev
+	       , "PRI-CFI:ACT:role=0x%02x:id=0x%02x:var=0x%02x:b/t=%d/%d\n",
 	       hw->cap_act_pri_cfi.role, hw->cap_act_pri_cfi.id,
 	       hw->cap_act_pri_cfi.variant, hw->cap_act_pri_cfi.bottom,
 	       hw->cap_act_pri_cfi.top);
@@ -817,7 +822,7 @@  static int prism2sta_getcardinfo(wlandevice_t *wlandev)
 					&hw->cap_act_sta_cfi,
 					sizeof(hfa384x_caplevel_t));
 	if (result) {
-		pr_err("Failed to retrieve STA_CFIACTRANGES\n");
+		netdev_err(wlandev->netdev, "Failed to retrieve STA_CFIACTRANGES\n");
 		goto failed;
 	}
 
@@ -829,8 +834,8 @@  static int prism2sta_getcardinfo(wlandevice_t *wlandev)
 	hw->cap_act_sta_cfi.bottom = le16_to_cpu(hw->cap_act_sta_cfi.bottom);
 	hw->cap_act_sta_cfi.top = le16_to_cpu(hw->cap_act_sta_cfi.top);
 
-	printk(KERN_INFO
-	       "STA-CFI:ACT:role=0x%02x:id=0x%02x:var=0x%02x:b/t=%d/%d\n",
+	netdev_info(wlandev->netdev
+	       , "STA-CFI:ACT:role=0x%02x:id=0x%02x:var=0x%02x:b/t=%d/%d\n",
 	       hw->cap_act_sta_cfi.role, hw->cap_act_sta_cfi.id,
 	       hw->cap_act_sta_cfi.variant, hw->cap_act_sta_cfi.bottom,
 	       hw->cap_act_sta_cfi.top);
@@ -840,7 +845,7 @@  static int prism2sta_getcardinfo(wlandevice_t *wlandev)
 					&hw->cap_act_sta_mfi,
 					sizeof(hfa384x_caplevel_t));
 	if (result) {
-		pr_err("Failed to retrieve STA_MFIACTRANGES\n");
+		netdev_err(wlandev->netdev, "Failed to retrieve STA_MFIACTRANGES\n");
 		goto failed;
 	}
 
@@ -852,8 +857,8 @@  static int prism2sta_getcardinfo(wlandevice_t *wlandev)
 	hw->cap_act_sta_mfi.bottom = le16_to_cpu(hw->cap_act_sta_mfi.bottom);
 	hw->cap_act_sta_mfi.top = le16_to_cpu(hw->cap_act_sta_mfi.top);
 
-	printk(KERN_INFO
-	       "STA-MFI:ACT:role=0x%02x:id=0x%02x:var=0x%02x:b/t=%d/%d\n",
+	netdev_info(wlandev->netdev
+	       , "STA-MFI:ACT:role=0x%02x:id=0x%02x:var=0x%02x:b/t=%d/%d\n",
 	       hw->cap_act_sta_mfi.role, hw->cap_act_sta_mfi.id,
 	       hw->cap_act_sta_mfi.variant, hw->cap_act_sta_mfi.bottom,
 	       hw->cap_act_sta_mfi.top);
@@ -864,9 +869,9 @@  static int prism2sta_getcardinfo(wlandevice_t *wlandev)
 	if (!result) {
 		wlan_mkprintstr(snum, HFA384x_RID_NICSERIALNUMBER_LEN,
 				pstr, sizeof(pstr));
-		printk(KERN_INFO "Prism2 card SN: %s\n", pstr);
+		netdev_info(wlandev->netdev, "Prism2 card SN: %s\n", pstr);
 	} else {
-		pr_err("Failed to retrieve Prism2 Card SN\n");
+		netdev_err(wlandev->netdev, "Failed to retrieve Prism2 Card SN\n");
 		goto failed;
 	}
 
@@ -874,7 +879,7 @@  static int prism2sta_getcardinfo(wlandevice_t *wlandev)
 	result = hfa384x_drvr_getconfig(hw, HFA384x_RID_CNFOWNMACADDR,
 					wlandev->netdev->dev_addr, ETH_ALEN);
 	if (result != 0) {
-		pr_err("Failed to retrieve mac address\n");
+		netdev_err(wlandev->netdev, "Failed to retrieve mac address\n");
 		goto failed;
 	}
 
@@ -902,7 +907,7 @@  static int prism2sta_getcardinfo(wlandevice_t *wlandev)
 
 	goto done;
 failed:
-	pr_err("Failed, result=%d\n", result);
+	netdev_err(wlandev->netdev, "Failed, result=%d\n", result);
 done:
 	return result;
 }
@@ -978,7 +983,7 @@  exit:
 static void prism2sta_inf_handover(wlandevice_t *wlandev,
 				   hfa384x_InfFrame_t *inf)
 {
-	pr_debug("received infoframe:HANDOVER (unhandled)\n");
+	netdev_dbg(wlandev->netdev, "received infoframe:HANDOVER (unhandled)\n");
 }
 
 /*----------------------------------------------------------------
@@ -1061,14 +1066,15 @@  static void prism2sta_inf_scanresults(wlandevice_t *wlandev,
 	nbss /= sizeof(hfa384x_ScanResultSub_t);
 
 	/* Print em */
-	pr_debug("rx scanresults, reason=%d, nbss=%d:\n",
+	netdev_dbg(wlandev->netdev, "rx scanresults, reason=%d, nbss=%d:\n",
 		 inf->info.scanresult.scanreason, nbss);
 	for (i = 0; i < nbss; i++) {
-		pr_debug("chid=%d anl=%d sl=%d bcnint=%d\n",
+		netdev_dbg(wlandev->netdev, "chid=%d anl=%d sl=%d bcnint=%d\n",
 			 sr->result[i].chid,
 			 sr->result[i].anl,
 			 sr->result[i].sl, sr->result[i].bcnint);
-		pr_debug("  capinfo=0x%04x proberesp_rate=%d\n",
+		netdev_dbg(wlandev->netdev
+			, "  capinfo=0x%04x proberesp_rate=%d\n",
 			 sr->result[i].capinfo, sr->result[i].proberesp_rate);
 	}
 	/* issue a join request */
@@ -1078,8 +1084,8 @@  static void prism2sta_inf_scanresults(wlandevice_t *wlandev,
 					HFA384x_RID_JOINREQUEST,
 					&joinreq, HFA384x_RID_JOINREQUEST_LEN);
 	if (result) {
-		pr_err("setconfig(joinreq) failed, result=%d\n",
-		       result);
+		netdev_err(wlandev->netdev
+		, "setconfig(joinreq) failed, result=%d\n", result);
 	}
 }
 
@@ -1107,7 +1113,7 @@  static void prism2sta_inf_hostscanresults(wlandevice_t *wlandev,
 	int nbss;
 
 	nbss = (inf->framelen - 3) / 32;
-	pr_debug("Received %d hostscan results\n", nbss);
+	netdev_dbg(wlandev->netdev, "Received %d hostscan results\n", nbss);
 
 	if (nbss > 32)
 		nbss = 32;
@@ -1170,7 +1176,8 @@  static void prism2sta_inf_chinforesults(wlandevice_t *wlandev,
 		chinforesult->pnl = le16_to_cpu(result->pnl);
 		chinforesult->active = le16_to_cpu(result->active);
 
-		pr_debug("chinfo: channel %d, %s level (avg/peak)=%d/%d dB, pcf %d\n",
+		netdev_dbg(wlandev->netdev
+		, "chinfo: channel %d, %s level (avg/peak)=%d/%d dB, pcf %d\n",
 			 chan + 1,
 			 (chinforesult->active & HFA384x_CHINFORESULT_BSSACTIVE)
 				? "signal" : "noise",
@@ -1219,7 +1226,8 @@  void prism2sta_processing_defer(struct work_struct *data)
 		 */
 		netif_carrier_off(wlandev->netdev);
 
-		printk(KERN_INFO "linkstatus=NOTCONNECTED (unhandled)\n");
+		netdev_info(wlandev->netdev
+		, "linkstatus=NOTCONNECTED (unhandled)\n");
 		break;
 
 	case HFA384x_LINK_CONNECTED:
@@ -1246,7 +1254,7 @@  void prism2sta_processing_defer(struct work_struct *data)
 		if (wlandev->netdev->type == ARPHRD_ETHER) {
 			u16 portstatus;
 
-			printk(KERN_INFO "linkstatus=CONNECTED\n");
+			netdev_info(wlandev->netdev, "linkstatus=CONNECTED\n");
 
 			/* For non-usb devices, we can use the sync versions */
 			/* Collect the BSSID, and set state to allow tx */
@@ -1256,8 +1264,8 @@  void prism2sta_processing_defer(struct work_struct *data)
 						wlandev->bssid,
 						WLAN_BSSID_LEN);
 			if (result) {
-				pr_debug
-				    ("getconfig(0x%02x) failed, result = %d\n",
+				netdev_dbg(wlandev->netdev
+				   , "getconfig(0x%02x) failed, result = %d\n",
 				     HFA384x_RID_CURRENTBSSID, result);
 				return;
 			}
@@ -1266,22 +1274,22 @@  void prism2sta_processing_defer(struct work_struct *data)
 							HFA384x_RID_CURRENTSSID,
 							&ssid, sizeof(ssid));
 			if (result) {
-				pr_debug
-				    ("getconfig(0x%02x) failed, result = %d\n",
+				netdev_dbg(wlandev->netdev
+				    , "getconfig(0x%02x) failed, result = %d\n",
 				     HFA384x_RID_CURRENTSSID, result);
 				return;
 			}
-			prism2mgmt_bytestr2pstr((struct hfa384x_bytestr *) &ssid,
-						(p80211pstrd_t *) &
-						wlandev->ssid);
+			prism2mgmt_bytestr2pstr(
+					(struct hfa384x_bytestr *) &ssid,
+					(p80211pstrd_t *) &wlandev->ssid);
 
 			/* Collect the port status */
 			result = hfa384x_drvr_getconfig16(hw,
 							HFA384x_RID_PORTSTATUS,
 							&portstatus);
 			if (result) {
-				pr_debug
-				    ("getconfig(0x%02x) failed, result = %d\n",
+				netdev_dbg(wlandev->netdev
+				, "getconfig(0x%02x) failed, result = %d\n",
 				     HFA384x_RID_PORTSTATUS, result);
 				return;
 			}
@@ -1308,8 +1316,8 @@  void prism2sta_processing_defer(struct work_struct *data)
 		 * Block Transmits, Ignore receives of data frames
 		 */
 		if (wlandev->netdev->type == ARPHRD_ETHER)
-			printk(KERN_INFO
-			       "linkstatus=DISCONNECTED (unhandled)\n");
+			netdev_info(wlandev->netdev
+			       , "linkstatus=DISCONNECTED (unhandled)\n");
 		wlandev->macmode = WLAN_MACMODE_NONE;
 
 		netif_carrier_off(wlandev->netdev);
@@ -1334,13 +1342,13 @@  void prism2sta_processing_defer(struct work_struct *data)
 		 * Indicate Reassociation
 		 * Enable Transmits, Receives and pass up data frames
 		 */
-		printk(KERN_INFO "linkstatus=AP_CHANGE\n");
+		netdev_info(wlandev->netdev, "linkstatus=AP_CHANGE\n");
 
 		result = hfa384x_drvr_getconfig(hw,
 						HFA384x_RID_CURRENTBSSID,
 						wlandev->bssid, WLAN_BSSID_LEN);
 		if (result) {
-			pr_debug("getconfig(0x%02x) failed, result = %d\n",
+			netdev_dbg(wlandev->netdev, "getconfig(0x%02x) failed, result = %d\n",
 				 HFA384x_RID_CURRENTBSSID, result);
 			return;
 		}
@@ -1349,7 +1357,7 @@  void prism2sta_processing_defer(struct work_struct *data)
 						HFA384x_RID_CURRENTSSID,
 						&ssid, sizeof(ssid));
 		if (result) {
-			pr_debug("getconfig(0x%02x) failed, result = %d\n",
+			netdev_dbg(wlandev->netdev, "getconfig(0x%02x) failed, result = %d\n",
 				 HFA384x_RID_CURRENTSSID, result);
 			return;
 		}
@@ -1376,7 +1384,7 @@  void prism2sta_processing_defer(struct work_struct *data)
 		 * Response:
 		 * Block Transmits, Ignore receives of data frames
 		 */
-		printk(KERN_INFO "linkstatus=AP_OUTOFRANGE (unhandled)\n");
+		netdev_info(wlandev->netdev, "linkstatus=AP_OUTOFRANGE (unhandled)\n");
 
 		netif_carrier_off(wlandev->netdev);
 
@@ -1389,7 +1397,7 @@  void prism2sta_processing_defer(struct work_struct *data)
 		 * Response:
 		 * Enable Transmits, Receives and pass up data frames
 		 */
-		printk(KERN_INFO "linkstatus=AP_INRANGE\n");
+		netdev_info(wlandev->netdev, "linkstatus=AP_INRANGE\n");
 
 		hw->link_status = HFA384x_LINK_CONNECTED;
 		netif_carrier_on(wlandev->netdev);
@@ -1413,10 +1421,10 @@  void prism2sta_processing_defer(struct work_struct *data)
 					       HFA384x_RID_JOINREQUEST,
 					       &joinreq,
 					       HFA384x_RID_JOINREQUEST_LEN);
-			printk(KERN_INFO
-			       "linkstatus=ASSOCFAIL (re-submitting join)\n");
+			netdev_info(wlandev->netdev
+			       , "linkstatus=ASSOCFAIL (re-submitting join)\n");
 		} else {
-			printk(KERN_INFO "linkstatus=ASSOCFAIL (unhandled)\n");
+			netdev_info(wlandev->netdev, "linkstatus=ASSOCFAIL (unhandled)\n");
 		}
 
 		netif_carrier_off(wlandev->netdev);
@@ -1428,7 +1436,8 @@  void prism2sta_processing_defer(struct work_struct *data)
 
 	default:
 		/* This is bad, IO port problems? */
-		pr_warn("unknown linkstatus=0x%02x\n", hw->link_status);
+		netdev_warn(wlandev->netdev, "unknown linkstatus=0x%02x\n"
+		, hw->link_status);
 		return;
 	}
 
@@ -1509,16 +1518,16 @@  static void prism2sta_inf_assocstatus(wlandevice_t *wlandev,
 
 	if (i >= hw->authlist.cnt) {
 		if (rec.assocstatus != HFA384x_ASSOCSTATUS_AUTHFAIL)
-			pr_warn(
-	"assocstatus info frame received for non-authenticated station.\n");
+			netdev_warn(wlandev->netdev
+	, "assocstatus info frame received for non-authenticated station.\n");
 	} else {
 		hw->authlist.assoc[i] =
 		    (rec.assocstatus == HFA384x_ASSOCSTATUS_STAASSOC ||
 		     rec.assocstatus == HFA384x_ASSOCSTATUS_REASSOC);
 
 		if (rec.assocstatus == HFA384x_ASSOCSTATUS_AUTHFAIL)
-			pr_warn(
-"authfail assocstatus info frame received for authenticated station.\n");
+			netdev_warn(wlandev->netdev
+, "authfail assocstatus info frame received for authenticated station.\n");
 	}
 }
 
@@ -1570,7 +1579,7 @@  static void prism2sta_inf_authreq_defer(wlandevice_t *wlandev,
 	 ** authentication.
 	 */
 
-	memcpy(rec.address, inf->info.authreq.sta_addr, ETH_ALEN);
+	ether_addr_copy(rec.address, inf->info.authreq.sta_addr);
 	rec.status = P80211ENUM_status_unspec_failure;
 
 	/*
@@ -1705,7 +1714,7 @@  static void prism2sta_inf_authreq_defer(wlandevice_t *wlandev,
 	if (result) {
 		if (added)
 			hw->authlist.cnt--;
-		pr_err("setconfig(authenticatestation) failed, result=%d\n",
+		netdev_err(wlandev->netdev, "setconfig(authenticatestation) failed, result=%d\n",
 		       result);
 	}
 }
@@ -1786,16 +1795,17 @@  void prism2sta_ev_info(wlandevice_t *wlandev, hfa384x_InfFrame_t *inf)
 		prism2sta_inf_psusercnt(wlandev, inf);
 		break;
 	case HFA384x_IT_KEYIDCHANGED:
-		pr_warn("Unhandled IT_KEYIDCHANGED\n");
+		netdev_warn(wlandev->netdev, "Unhandled IT_KEYIDCHANGED\n");
 		break;
 	case HFA384x_IT_ASSOCREQ:
-		pr_warn("Unhandled IT_ASSOCREQ\n");
+		netdev_warn(wlandev->netdev, "Unhandled IT_ASSOCREQ\n");
 		break;
 	case HFA384x_IT_MICFAILURE:
-		pr_warn("Unhandled IT_MICFAILURE\n");
+		netdev_warn(wlandev->netdev, "Unhandled IT_MICFAILURE\n");
 		break;
 	default:
-		pr_warn("Unknown info type=0x%02x\n", inf->infotype);
+		netdev_warn(wlandev->netdev, "Unknown info type=0x%02x\n",
+				 inf->infotype);
 		break;
 	}
 }
@@ -1821,7 +1831,7 @@  void prism2sta_ev_info(wlandevice_t *wlandev, hfa384x_InfFrame_t *inf)
 ----------------------------------------------------------------*/
 void prism2sta_ev_txexc(wlandevice_t *wlandev, u16 status)
 {
-	pr_debug("TxExc status=0x%x.\n", status);
+	netdev_dbg(wlandev->netdev, "TxExc status=0x%x.\n", status);
 }
 
 /*----------------------------------------------------------------
@@ -1842,7 +1852,7 @@  void prism2sta_ev_txexc(wlandevice_t *wlandev, u16 status)
 ----------------------------------------------------------------*/
 void prism2sta_ev_tx(wlandevice_t *wlandev, u16 status)
 {
-	pr_debug("Tx Complete, status=0x%04x\n", status);
+	netdev_dbg(wlandev->netdev, "Tx Complete, status=0x%04x\n", status);
 	/* update linux network stats */
 	wlandev->linux_stats.tx_packets++;
 }
@@ -1918,7 +1928,8 @@  static wlandevice_t *create_wlan(void)
 	hw = kzalloc(sizeof(hfa384x_t), GFP_KERNEL);
 
 	if (!wlandev || !hw) {
-		pr_err("%s: Memory allocation failure.\n", dev_info);
+		netdev_err(wlandev->netdev, "%s: Memory allocation failure.\n",
+				 dev_info);
 		kfree(wlandev);
 		kfree(hw);
 		return NULL;
@@ -1970,14 +1981,15 @@  void prism2sta_commsqual_defer(struct work_struct *data)
 				&hw->qual, HFA384x_RID_DBMCOMMSQUALITY_LEN);
 
 		if (result) {
-			pr_err("error fetching commsqual\n");
+			netdev_err(wlandev->netdev
+				, "error fetching commsqual\n");
 			return;
 		}
 
-		pr_debug("commsqual %d %d %d\n",
-			 le16_to_cpu(hw->qual.CQ_currBSS),
-			 le16_to_cpu(hw->qual.ASL_currBSS),
-			 le16_to_cpu(hw->qual.ANL_currFC));
+		netdev_dbg(wlandev->netdev, "commsqual %d %d %d\n"
+			 , le16_to_cpu(hw->qual.CQ_currBSS)
+			 ,  le16_to_cpu(hw->qual.ASL_currBSS)
+			 , le16_to_cpu(hw->qual.ANL_currFC));
 	}
 
 	/* Get the signal rate */
@@ -1986,8 +1998,8 @@  void prism2sta_commsqual_defer(struct work_struct *data)
 	result = p80211req_dorequest(wlandev, (u8 *) &msg);
 
 	if (result) {
-		pr_debug("get signal rate failed, result = %d\n",
-			 result);
+		netdev_dbg(wlandev->netdev
+			, "get signal rate failed, result = %d\n", result);
 		return;
 	}
 
@@ -2005,7 +2017,8 @@  void prism2sta_commsqual_defer(struct work_struct *data)
 		hw->txrate = 110;
 		break;
 	default:
-		pr_debug("Bad ratebit (%d)\n", mibitem->data);
+		netdev_dbg(wlandev->netdev, "Bad ratebit (%d)\n"
+				, mibitem->data);
 	}
 
 	/* Lastly, we need to make sure the BSSID didn't change on us */
@@ -2013,8 +2026,9 @@  void prism2sta_commsqual_defer(struct work_struct *data)
 					HFA384x_RID_CURRENTBSSID,
 					wlandev->bssid, WLAN_BSSID_LEN);
 	if (result) {
-		pr_debug("getconfig(0x%02x) failed, result = %d\n",
-			 HFA384x_RID_CURRENTBSSID, result);
+		netdev_dbg(wlandev->netdev
+				 , "getconfig(0x%02x) failed, result = %d\n",
+				 HFA384x_RID_CURRENTBSSID, result);
 		return;
 	}
 
@@ -2022,8 +2036,9 @@  void prism2sta_commsqual_defer(struct work_struct *data)
 					HFA384x_RID_CURRENTSSID,
 					&ssid, sizeof(ssid));
 	if (result) {
-		pr_debug("getconfig(0x%02x) failed, result = %d\n",
-			 HFA384x_RID_CURRENTSSID, result);
+		netdev_dbg(wlandev->netdev
+		, "getconfig(0x%02x) failed,result = %d\n"
+		, HFA384x_RID_CURRENTSSID, result);
 		return;
 	}
 	prism2mgmt_bytestr2pstr((struct hfa384x_bytestr *) &ssid,