* [PATCH] staging/wlan-ng: Change KERN_DEBUG or pr_debug to match orig driver
@ 2009-05-08 19:54 Karl Relton
2009-05-08 20:25 ` Jiri Slaby
0 siblings, 1 reply; 3+ messages in thread
From: Karl Relton @ 2009-05-08 19:54 UTC (permalink / raw)
To: Greg KH; +Cc: linux-kernel
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@ntlworld.com>
--- c/drivers/staging/wlan-ng/hfa384x_usb.c 2009-05-07 20:02:48.000000000 +0100
+++ d/drivers/staging/wlan-ng/hfa384x_usb.c 2009-05-08 19:05:56.000000000 +0100
@@ -1174,7 +1174,7 @@ int hfa384x_cmd_download(hfa384x_t *hw,
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
/* 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
/* 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(struc
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@lists.linux-wlan.com\n");
ctlx->state = CTLX_RESP_COMPLETE;
break;
@@ -3552,7 +3552,7 @@ static void hfa384x_usbin_rx(wlandevice_
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 pd
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;
--- c/drivers/staging/wlan-ng/p80211conv.c 2009-04-30 05:48:16.000000000 +0100
+++ d/drivers/staging/wlan-ng/p80211conv.c 2009-05-08 19:06:57.000000000 +0100
@@ -329,7 +329,7 @@ int skb_p80211_to_ether(wlandevice_t *wl
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++;
--- c/drivers/staging/wlan-ng/p80211wext.c 2009-04-30 05:48:16.000000000 +0100
+++ d/drivers/staging/wlan-ng/p80211wext.c 2009-05-08 19:09:50.000000000 +0100
@@ -1561,7 +1561,7 @@ static int p80211wext_get_encodeext(stru
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;
--- c/drivers/staging/wlan-ng/prism2mgmt.c 2009-04-30 05:48:16.000000000 +0100
+++ d/drivers/staging/wlan-ng/prism2mgmt.c 2009-05-08 19:11:11.000000000 +0100
@@ -1096,7 +1096,7 @@ int prism2mgmt_wlansniff(wlandevice_t *w
/* 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 *w
/* 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 *w
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 *w
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 *w
/* 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 *w
&(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 *w
&(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 *w
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 *w
/* 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 *w
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 *w
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 *w
}
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 *w
/* 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 *w
/* 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;
--- c/drivers/staging/wlan-ng/prism2sta.c 2009-04-30 05:48:16.000000000 +0100
+++ d/drivers/staging/wlan-ng/prism2sta.c 2009-05-08 19:15:08.000000000 +0100
@@ -1188,7 +1188,7 @@ static void prism2sta_inf_chinforesults(
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 w
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 w
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 w
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 w
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 w
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 wo
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 wo
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;
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] staging/wlan-ng: Change KERN_DEBUG or pr_debug to match orig driver
2009-05-08 19:54 [PATCH] staging/wlan-ng: Change KERN_DEBUG or pr_debug to match orig driver Karl Relton
@ 2009-05-08 20:25 ` Jiri Slaby
2009-05-08 20:54 ` Karl Relton
0 siblings, 1 reply; 3+ messages in thread
From: Jiri Slaby @ 2009-05-08 20:25 UTC (permalink / raw)
To: Karl Relton; +Cc: Greg KH, linux-kernel
On 05/08/2009 09:54 PM, Karl Relton wrote:
> Change uses of KERN_DEBUG over to pr_debug to match original driver
> where messages are only needed during driver development.
Hmm, but many of them don't fit this rule. Some of them should be
honored a higher level, some of them simply should be left as such,
because we want to see the information.
> --- c/drivers/staging/wlan-ng/prism2mgmt.c 2009-04-30 05:48:16.000000000 +0100
> +++ d/drivers/staging/wlan-ng/prism2mgmt.c 2009-05-08 19:11:11.000000000 +0100
> @@ -1096,7 +1096,7 @@ int prism2mgmt_wlansniff(wlandevice_t *w
> /* 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",
rather an ERROR or WARNING?
> --- c/drivers/staging/wlan-ng/prism2sta.c 2009-04-30 05:48:16.000000000 +0100
> +++ d/drivers/staging/wlan-ng/prism2sta.c 2009-05-08 19:15:08.000000000 +0100
> @@ -1188,7 +1188,7 @@ static void prism2sta_inf_chinforesults(
> 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",
yeah, useless info for an user (the change is OK), but:
> @@ -1276,7 +1276,7 @@ void prism2sta_processing_defer(struct w
> wlandev->bssid,
> WLAN_BSSID_LEN);
> if (result) {
> - printk(KERN_DEBUG
> + pr_debug(
> "getconfig(0x%02x) failed, result = %d\n",
> HFA384x_RID_CURRENTBSSID, result);
we want likely to know this one.
etc.
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] staging/wlan-ng: Change KERN_DEBUG or pr_debug to match orig driver
2009-05-08 20:25 ` Jiri Slaby
@ 2009-05-08 20:54 ` Karl Relton
0 siblings, 0 replies; 3+ messages in thread
From: Karl Relton @ 2009-05-08 20:54 UTC (permalink / raw)
To: Jiri Slaby; +Cc: Greg KH, linux-kernel
On Fri, 2009-05-08 at 22:25 +0200, Jiri Slaby wrote:
> On 05/08/2009 09:54 PM, Karl Relton wrote:
> > Change uses of KERN_DEBUG over to pr_debug to match original driver
> > where messages are only needed during driver development.
>
> Hmm, but many of them don't fit this rule. Some of them should be
> honored a higher level, some of them simply should be left as such,
> because we want to see the information.
>
I see your point, but the motivation of this patch was to be consistent
with the original out-of-tree driver. For all these messages that used
its own macro WLAN_LOG_DEBUG which depended on a compile-time flag. For
normal use, the flag would be unset which meant you would get none of
the messages.
Now I agree that you could question the logic of some of the messages
being 'debug only' - but there are probably lots of other messages in
this driver that also have a questionable level. Previously someone else
had already converted some of messages to pr_debug - this patch merely
cleaned up to make them consistent (with the original driver).
Karl
> > --- c/drivers/staging/wlan-ng/prism2mgmt.c 2009-04-30 05:48:16.000000000 +0100
> > +++ d/drivers/staging/wlan-ng/prism2mgmt.c 2009-05-08 19:11:11.000000000 +0100
> > @@ -1096,7 +1096,7 @@ int prism2mgmt_wlansniff(wlandevice_t *w
> > /* 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",
>
> rather an ERROR or WARNING?
>
> > --- c/drivers/staging/wlan-ng/prism2sta.c 2009-04-30 05:48:16.000000000 +0100
> > +++ d/drivers/staging/wlan-ng/prism2sta.c 2009-05-08 19:15:08.000000000 +0100
> > @@ -1188,7 +1188,7 @@ static void prism2sta_inf_chinforesults(
> > 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",
>
> yeah, useless info for an user (the change is OK), but:
>
> > @@ -1276,7 +1276,7 @@ void prism2sta_processing_defer(struct w
> > wlandev->bssid,
> > WLAN_BSSID_LEN);
> > if (result) {
> > - printk(KERN_DEBUG
> > + pr_debug(
> > "getconfig(0x%02x) failed, result = %d\n",
> > HFA384x_RID_CURRENTBSSID, result);
>
> we want likely to know this one.
>
> etc.
>
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2009-05-08 20:54 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2009-05-08 19:54 [PATCH] staging/wlan-ng: Change KERN_DEBUG or pr_debug to match orig driver Karl Relton
2009-05-08 20:25 ` Jiri Slaby
2009-05-08 20:54 ` Karl Relton
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox