[PATCH 153/342] Staging: wlan-ng: Change KERN_DEBUG or pr_debug to match orig driver
Greg Kroah-Hartman
gregkh at suse.de
Fri Jun 19 18:06:17 UTC 2009
From: Karl Relton <karllinuxtest.relton at ntlworld.com>
Change uses of KERN_DEBUG over to pr_debug to match original driver
where messages are only needed during driver development.
Signed-off-by: Karl Relton <karllinuxtest.relton at ntlworld.com>
Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>
---
drivers/staging/wlan-ng/hfa384x_usb.c | 22 +++++++++++-----------
drivers/staging/wlan-ng/p80211conv.c | 2 +-
drivers/staging/wlan-ng/p80211wext.c | 2 +-
drivers/staging/wlan-ng/prism2mgmt.c | 28 ++++++++++++++--------------
drivers/staging/wlan-ng/prism2sta.c | 16 ++++++++--------
5 files changed, 35 insertions(+), 35 deletions(-)
diff --git a/drivers/staging/wlan-ng/hfa384x_usb.c b/drivers/staging/wlan-ng/hfa384x_usb.c
index 6790bc5..be297b9 100644
--- a/drivers/staging/wlan-ng/hfa384x_usb.c
+++ b/drivers/staging/wlan-ng/hfa384x_usb.c
@@ -1174,7 +1174,7 @@ int hfa384x_cmd_download(hfa384x_t *hw, u16 mode, u16 lowaddr,
int result = 0;
hfa384x_metacmd_t cmd;
- printk(KERN_DEBUG
+ pr_debug(
"mode=%d, lowaddr=0x%04x, highaddr=0x%04x, codelen=%d\n",
mode, lowaddr, highaddr, codelen);
@@ -1651,7 +1651,7 @@ hfa384x_dormem(hfa384x_t *hw,
ctlx->outbufsize = sizeof(ctlx->outbuf.rmemreq);
- printk(KERN_DEBUG
+ pr_debug(
"type=0x%04x frmlen=%d offset=0x%04x page=0x%04x\n",
ctlx->outbuf.rmemreq.type,
ctlx->outbuf.rmemreq.frmlen,
@@ -2035,7 +2035,7 @@ int hfa384x_drvr_flashdl_write(hfa384x_t *hw, u32 daddr, void *buf, u32 len)
/* NOTE: dlbuffer RID stores the address in AUX format */
dlbufaddr =
HFA384x_ADDR_AUX_MKFLAT(hw->bufinfo.page, hw->bufinfo.offset);
- printk(KERN_DEBUG
+ pr_debug(
"dlbuf.page=0x%04x dlbuf.offset=0x%04x dlbufaddr=0x%08x\n",
hw->bufinfo.page, hw->bufinfo.offset, dlbufaddr);
@@ -2323,7 +2323,7 @@ int hfa384x_drvr_ramdl_enable(hfa384x_t *hw, u32 exeaddr)
/* Set the download state */
hw->dlstate = HFA384x_DLSTATE_RAMENABLED;
} else {
- printk(KERN_DEBUG
+ pr_debug(
"cmd_download(0x%04x, 0x%04x) failed, result=%d.\n",
lowaddr, hiaddr, result);
}
@@ -2629,10 +2629,10 @@ int hfa384x_drvr_start(hfa384x_t *hw)
usb_kill_urb(&hw->rx_urb);
goto done;
} else {
- printk(KERN_DEBUG
+ pr_debug(
"First cmd_initialize() failed (result %d),\n",
result1);
- printk(KERN_DEBUG
+ pr_debug(
"but second attempt succeeded. All should be ok\n");
}
} else if (result2 != 0) {
@@ -3301,7 +3301,7 @@ static void hfa384x_usbin_callback(struct urb *urb)
break;
default:
- printk(KERN_DEBUG
+ pr_debug(
"Unrecognized USBIN packet, type=%x, status=%d\n",
usbin->type, urb_status);
break;
@@ -3399,7 +3399,7 @@ retry:
* our request has been acknowledged. Odd,
* but our OUT URB is still alive...
*/
- printk(KERN_DEBUG
+ pr_debug(
"Causality violation: please reboot Universe, or email linux-wlan-devel at lists.linux-wlan.com\n");
ctlx->state = CTLX_RESP_COMPLETE;
break;
@@ -3552,7 +3552,7 @@ static void hfa384x_usbin_rx(wlandevice_t *wlandev, struct sk_buff *skb)
hfa384x_int_rxmonitor(wlandev, &usbin->rxfrm);
dev_kfree_skb(skb);
} else {
- printk(KERN_DEBUG
+ pr_debug(
"Received monitor frame: FCSerr set\n");
}
break;
@@ -4171,13 +4171,13 @@ static int hfa384x_isgood_pdrcode(u16 pdrcode)
default:
if (pdrcode < 0x1000) {
/* code is OK, but we don't know exactly what it is */
- printk(KERN_DEBUG
+ pr_debug(
"Encountered unknown PDR#=0x%04x, "
"assuming it's ok.\n", pdrcode);
return 1;
} else {
/* bad code */
- printk(KERN_DEBUG
+ pr_debug(
"Encountered unknown PDR#=0x%04x, "
"(>=0x1000), assuming it's bad.\n", pdrcode);
return 0;
diff --git a/drivers/staging/wlan-ng/p80211conv.c b/drivers/staging/wlan-ng/p80211conv.c
index 2abce0c..44266b8 100644
--- a/drivers/staging/wlan-ng/p80211conv.c
+++ b/drivers/staging/wlan-ng/p80211conv.c
@@ -329,7 +329,7 @@ int skb_p80211_to_ether(wlandevice_t *wlandev, u32 ethconv,
skb->data + payload_offset +
payload_length - 4))) {
/* de-wep failed, drop skb. */
- printk(KERN_DEBUG
+ pr_debug(
"Host de-WEP failed, dropping frame (%d).\n",
foo);
wlandev->rx.decrypt_err++;
diff --git a/drivers/staging/wlan-ng/p80211wext.c b/drivers/staging/wlan-ng/p80211wext.c
index 96078b0..3a96fce 100644
--- a/drivers/staging/wlan-ng/p80211wext.c
+++ b/drivers/staging/wlan-ng/p80211wext.c
@@ -1561,7 +1561,7 @@ static int p80211wext_get_encodeext(struct net_device *dev,
if (idx) {
if (idx < 1 || idx > NUM_WEPKEYS) {
- printk(KERN_DEBUG
+ pr_debug(
"get_encode_ext invalid key index [%d]\n", idx);
result = -EINVAL;
goto exit;
diff --git a/drivers/staging/wlan-ng/prism2mgmt.c b/drivers/staging/wlan-ng/prism2mgmt.c
index e7a7939..d2e5fcc 100644
--- a/drivers/staging/wlan-ng/prism2mgmt.c
+++ b/drivers/staging/wlan-ng/prism2mgmt.c
@@ -1096,7 +1096,7 @@ int prism2mgmt_wlansniff(wlandevice_t *wlandev, void *msgp)
/* Disable monitor mode */
result = hfa384x_cmd_monitor(hw, HFA384x_MONITOR_DISABLE);
if (result) {
- printk(KERN_DEBUG
+ pr_debug(
"failed to disable monitor mode, result=%d\n",
result);
goto failed;
@@ -1104,7 +1104,7 @@ int prism2mgmt_wlansniff(wlandevice_t *wlandev, void *msgp)
/* Disable port 0 */
result = hfa384x_drvr_disable(hw, 0);
if (result) {
- printk(KERN_DEBUG
+ pr_debug(
"failed to disable port 0 after sniffing, result=%d\n",
result);
goto failed;
@@ -1117,7 +1117,7 @@ int prism2mgmt_wlansniff(wlandevice_t *wlandev, void *msgp)
HFA384x_RID_CNFWEPFLAGS,
hw->presniff_wepflags);
if (result) {
- printk(KERN_DEBUG
+ pr_debug(
"failed to restore wepflags=0x%04x, result=%d\n",
hw->presniff_wepflags, result);
goto failed;
@@ -1130,7 +1130,7 @@ int prism2mgmt_wlansniff(wlandevice_t *wlandev, void *msgp)
HFA384x_RID_CNFPORTTYPE,
word);
if (result) {
- printk(KERN_DEBUG
+ pr_debug(
"failed to restore porttype, result=%d\n",
result);
goto failed;
@@ -1139,7 +1139,7 @@ int prism2mgmt_wlansniff(wlandevice_t *wlandev, void *msgp)
/* Enable the port */
result = hfa384x_drvr_enable(hw, 0);
if (result) {
- printk(KERN_DEBUG
+ pr_debug(
"failed to enable port to presniff setting, result=%d\n",
result);
goto failed;
@@ -1164,7 +1164,7 @@ int prism2mgmt_wlansniff(wlandevice_t *wlandev, void *msgp)
&(hw->
presniff_port_type));
if (result) {
- printk(KERN_DEBUG
+ pr_debug(
"failed to read porttype, result=%d\n",
result);
goto failed;
@@ -1175,7 +1175,7 @@ int prism2mgmt_wlansniff(wlandevice_t *wlandev, void *msgp)
&(hw->
presniff_wepflags));
if (result) {
- printk(KERN_DEBUG
+ pr_debug(
"failed to read wepflags, result=%d\n",
result);
goto failed;
@@ -1183,7 +1183,7 @@ int prism2mgmt_wlansniff(wlandevice_t *wlandev, void *msgp)
hfa384x_drvr_stop(hw);
result = hfa384x_drvr_start(hw);
if (result) {
- printk(KERN_DEBUG
+ pr_debug(
"failed to restart the card for sniffing, result=%d\n",
result);
goto failed;
@@ -1192,7 +1192,7 @@ int prism2mgmt_wlansniff(wlandevice_t *wlandev, void *msgp)
/* Disable the port */
result = hfa384x_drvr_disable(hw, 0);
if (result) {
- printk(KERN_DEBUG
+ pr_debug(
"failed to enable port for sniffing, result=%d\n",
result);
goto failed;
@@ -1210,7 +1210,7 @@ int prism2mgmt_wlansniff(wlandevice_t *wlandev, void *msgp)
hw->sniff_channel = word;
if (result) {
- printk(KERN_DEBUG
+ pr_debug(
"failed to set channel %d, result=%d\n",
word, result);
goto failed;
@@ -1224,7 +1224,7 @@ int prism2mgmt_wlansniff(wlandevice_t *wlandev, void *msgp)
HFA384x_RID_CNFPORTTYPE,
word);
if (result) {
- printk(KERN_DEBUG
+ pr_debug(
"failed to set porttype %d, result=%d\n",
word, result);
goto failed;
@@ -1243,7 +1243,7 @@ int prism2mgmt_wlansniff(wlandevice_t *wlandev, void *msgp)
}
if (result) {
- printk(KERN_DEBUG
+ pr_debug(
"failed to set wepflags=0x%04x, result=%d\n",
word, result);
goto failed;
@@ -1269,7 +1269,7 @@ int prism2mgmt_wlansniff(wlandevice_t *wlandev, void *msgp)
/* Enable the port */
result = hfa384x_drvr_enable(hw, 0);
if (result) {
- printk(KERN_DEBUG
+ pr_debug(
"failed to enable port for sniffing, result=%d\n",
result);
goto failed;
@@ -1277,7 +1277,7 @@ int prism2mgmt_wlansniff(wlandevice_t *wlandev, void *msgp)
/* Enable monitor mode */
result = hfa384x_cmd_monitor(hw, HFA384x_MONITOR_ENABLE);
if (result) {
- printk(KERN_DEBUG
+ pr_debug(
"failed to enable monitor mode, result=%d\n",
result);
goto failed;
diff --git a/drivers/staging/wlan-ng/prism2sta.c b/drivers/staging/wlan-ng/prism2sta.c
index 9d57f82..573e93a 100644
--- a/drivers/staging/wlan-ng/prism2sta.c
+++ b/drivers/staging/wlan-ng/prism2sta.c
@@ -1188,7 +1188,7 @@ static void prism2sta_inf_chinforesults(wlandevice_t *wlandev,
chinforesult->active =
le16_to_cpu(inf->info.chinforesult.result[n].
active);
- printk(KERN_DEBUG
+ pr_debug(
"chinfo: channel %d, %s level (avg/peak)=%d/%d dB, pcf %d\n",
channel + 1,
chinforesult->
@@ -1276,7 +1276,7 @@ void prism2sta_processing_defer(struct work_struct *data)
wlandev->bssid,
WLAN_BSSID_LEN);
if (result) {
- printk(KERN_DEBUG
+ pr_debug(
"getconfig(0x%02x) failed, result = %d\n",
HFA384x_RID_CURRENTBSSID, result);
goto failed;
@@ -1286,7 +1286,7 @@ void prism2sta_processing_defer(struct work_struct *data)
HFA384x_RID_CURRENTSSID,
&ssid, sizeof(ssid));
if (result) {
- printk(KERN_DEBUG
+ pr_debug(
"getconfig(0x%02x) failed, result = %d\n",
HFA384x_RID_CURRENTSSID, result);
goto failed;
@@ -1300,7 +1300,7 @@ void prism2sta_processing_defer(struct work_struct *data)
HFA384x_RID_PORTSTATUS,
&portstatus);
if (result) {
- printk(KERN_DEBUG
+ pr_debug(
"getconfig(0x%02x) failed, result = %d\n",
HFA384x_RID_PORTSTATUS, result);
goto failed;
@@ -1366,7 +1366,7 @@ void prism2sta_processing_defer(struct work_struct *data)
HFA384x_RID_CURRENTBSSID,
wlandev->bssid, WLAN_BSSID_LEN);
if (result) {
- printk(KERN_DEBUG
+ pr_debug(
"getconfig(0x%02x) failed, result = %d\n",
HFA384x_RID_CURRENTBSSID, result);
goto failed;
@@ -1376,7 +1376,7 @@ void prism2sta_processing_defer(struct work_struct *data)
HFA384x_RID_CURRENTSSID,
&ssid, sizeof(ssid));
if (result) {
- printk(KERN_DEBUG
+ pr_debug(
"getconfig(0x%02x) failed, result = %d\n",
HFA384x_RID_CURRENTSSID, result);
goto failed;
@@ -2030,7 +2030,7 @@ void prism2sta_commsqual_defer(struct work_struct *data)
HFA384x_RID_CURRENTBSSID,
wlandev->bssid, WLAN_BSSID_LEN);
if (result) {
- printk(KERN_DEBUG
+ pr_debug(
"getconfig(0x%02x) failed, result = %d\n",
HFA384x_RID_CURRENTBSSID, result);
goto done;
@@ -2040,7 +2040,7 @@ void prism2sta_commsqual_defer(struct work_struct *data)
HFA384x_RID_CURRENTSSID,
&ssid, sizeof(ssid));
if (result) {
- printk(KERN_DEBUG
+ pr_debug(
"getconfig(0x%02x) failed, result = %d\n",
HFA384x_RID_CURRENTSSID, result);
goto done;
--
1.6.3.2
More information about the devel
mailing list