[PATCH 4/4] staging/wlan-ng: replace printk() with pr_xxx()

Denis Pithon
2014-05-12T15:25:07Z

Fix some coding style issues concerning printk() usage.

Signed-off-by: Denis Pithon <denis.pithon@gmail.com>
---
drivers/staging/wlan-ng/p80211netdev.c | 17 +++++++++--------
1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/drivers/staging/wlan-ng/p80211netdev.c b/drivers/staging/wlan-ng/p80211netdev.c
index 61a3092..3577d20 100644
--- a/drivers/staging/wlan-ng/p80211netdev.c
+++ b/drivers/staging/wlan-ng/p80211netdev.c
@@ -384,8 +384,9 @@ static int p80211knetdev_hard_start_xmit(struct sk_buff *skb,
*/
if (skb->protocol != ETH_P_80211_RAW) {
netif_start_queue(wlandev->netdev);
- printk(KERN_NOTICE
- "Tx attempt prior to association, frame dropped.\n");
+ pr_notice(
+ "Tx attempt prior to association, frame dropped\n"
+ );
wlandev->linux_stats.tx_dropped++;
result = 0;
goto failed;
@@ -684,8 +685,9 @@ static int p80211knetdev_set_mac_address(netdevice_t *dev, void *addr)
* change the netdev address
*/
if (result != 0 || resultcode->data != P80211ENUM_resultcode_success) {
- printk(KERN_ERR
- "Low-level driver failed dot11req_mibset(dot11MACAddress).\n");
+ pr_err(
+ "Low-level driver failed dot11req_mibset(dot11MACAddress)\n"
+ );
result = -EADDRNOTAVAIL;
} else {
/* everything's ok, change the addr in netdev */
@@ -764,7 +766,7 @@ int wlan_setup(wlandevice_t *wlandev, struct device *physdev)
/* Allocate and initialize the wiphy struct */
wiphy = wlan_create_wiphy(physdev, wlandev);
if (wiphy == NULL) {
- printk(KERN_ERR "Failed to alloc wiphy.\n");
+ pr_err("Failed to alloc wiphy.\n");
return 1;
}

@@ -772,7 +774,7 @@ int wlan_setup(wlandevice_t *wlandev, struct device *physdev)
netdev = alloc_netdev(sizeof(struct wireless_dev), "wlan%d",
ether_setup);
if (netdev == NULL) {
- printk(KERN_ERR "Failed to alloc netdev.\n");
+ pr_err("Failed to alloc netdev.\n");
wlan_free_wiphy(wiphy);
result = 1;
} else {
@@ -1104,8 +1106,7 @@ static void p80211knetdev_tx_timeout(netdevice_t *netdev)
if (wlandev->tx_timeout) {
wlandev->tx_timeout(wlandev);
} else {
- printk(KERN_WARNING "Implement tx_timeout for %s\n",
- wlandev->nsdname);
+ pr_warn("Implement tx_timeout for %s\n", wlandev->nsdname);
netif_wake_queue(wlandev->netdev);
}
}
--
1.8.1.4