diff options
author | Joe Perches <joe@perches.com> | 2011-07-20 11:51:35 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2011-07-21 14:52:05 -0400 |
commit | 292b11926fec139c0ff103bc229bc6c079d0862f (patch) | |
tree | b960f9363ee4eaa0846039e2e4f17e796a055651 /drivers/net/wireless/rtlwifi/usb.c | |
parent | 6054069a03f77ffa686e2dfd5f07cff8ee40b72d (diff) |
rtlwifi: Convert printks to pr_<level>
Use the current logging styles.
Add pr_fmt where appropriate.
Remove now unnecessary prefixes from printks.
Convert hard coded prefix to __func__.
Add a missing "\n" to a format.
Signed-off-by: Joe Perches <joe@perches.com>
Acked-by: Larry Finger <Larry.Finger@lwfinger.net>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/rtlwifi/usb.c')
-rw-r--r-- | drivers/net/wireless/rtlwifi/usb.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/drivers/net/wireless/rtlwifi/usb.c b/drivers/net/wireless/rtlwifi/usb.c index a9367eba1ea7..8b1cef0ffde6 100644 --- a/drivers/net/wireless/rtlwifi/usb.c +++ b/drivers/net/wireless/rtlwifi/usb.c | |||
@@ -24,6 +24,9 @@ | |||
24 | * Hsinchu 300, Taiwan. | 24 | * Hsinchu 300, Taiwan. |
25 | * | 25 | * |
26 | *****************************************************************************/ | 26 | *****************************************************************************/ |
27 | |||
28 | #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt | ||
29 | |||
27 | #include <linux/usb.h> | 30 | #include <linux/usb.h> |
28 | #include "core.h" | 31 | #include "core.h" |
29 | #include "wifi.h" | 32 | #include "wifi.h" |
@@ -104,9 +107,8 @@ static int _usbctrl_vendorreq_sync_read(struct usb_device *udev, u8 request, | |||
104 | pdata, len, 0); /* max. timeout */ | 107 | pdata, len, 0); /* max. timeout */ |
105 | 108 | ||
106 | if (status < 0) | 109 | if (status < 0) |
107 | printk(KERN_ERR "reg 0x%x, usbctrl_vendorreq TimeOut! " | 110 | pr_err("reg 0x%x, usbctrl_vendorreq TimeOut! status:0x%x value=0x%x\n", |
108 | "status:0x%x value=0x%x\n", value, status, | 111 | value, status, *(u32 *)pdata); |
109 | *(u32 *)pdata); | ||
110 | return status; | 112 | return status; |
111 | } | 113 | } |
112 | 114 | ||
@@ -316,7 +318,7 @@ static int _rtl_usb_init_rx(struct ieee80211_hw *hw) | |||
316 | rtlusb->usb_rx_segregate_hdl = | 318 | rtlusb->usb_rx_segregate_hdl = |
317 | rtlpriv->cfg->usb_interface_cfg->usb_rx_segregate_hdl; | 319 | rtlpriv->cfg->usb_interface_cfg->usb_rx_segregate_hdl; |
318 | 320 | ||
319 | printk(KERN_INFO "rtl8192cu: rx_max_size %d, rx_urb_num %d, in_ep %d\n", | 321 | pr_info("rx_max_size %d, rx_urb_num %d, in_ep %d\n", |
320 | rtlusb->rx_max_size, rtlusb->rx_urb_num, rtlusb->in_ep); | 322 | rtlusb->rx_max_size, rtlusb->rx_urb_num, rtlusb->in_ep); |
321 | init_usb_anchor(&rtlusb->rx_submitted); | 323 | init_usb_anchor(&rtlusb->rx_submitted); |
322 | return 0; | 324 | return 0; |
@@ -580,7 +582,7 @@ static void _rtl_rx_completed(struct urb *_urb) | |||
580 | } else{ | 582 | } else{ |
581 | /* TO DO */ | 583 | /* TO DO */ |
582 | _rtl_rx_pre_process(hw, skb); | 584 | _rtl_rx_pre_process(hw, skb); |
583 | printk(KERN_ERR "rtlwifi: rx agg not supported\n"); | 585 | pr_err("rx agg not supported\n"); |
584 | } | 586 | } |
585 | goto resubmit; | 587 | goto resubmit; |
586 | } | 588 | } |