From: Denis Pithon <denis.pithon@gmail.com>
To: gregkh@linuxfoundation.org
Cc: himangi774@gmail.com, devel@driverdev.osuosl.org,
linux-kernel@vger.kernel.org
Subject: [PATCH 4/4] staging/wlan-ng: replace printk() with pr_xxx()
Date: Mon, 12 May 2014 17:22:47 +0200 [thread overview]
Message-ID: <1399908167-19271-4-git-send-email-denis.pithon@gmail.com> (raw)
In-Reply-To: <1399908167-19271-1-git-send-email-denis.pithon@gmail.com>
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
next prev parent reply other threads:[~2014-05-12 15:25 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-05-12 15:22 [PATCH 1/4] staging/wlan-ng: update function header comment Denis Pithon
2014-05-12 15:22 ` [PATCH 2/4] staging/wlan-ng: remove function declaration Denis Pithon
2014-05-12 15:22 ` [PATCH 3/4] staging/wlan-ng: code refactoring Denis Pithon
2014-05-16 7:26 ` Tobias Klauser
2014-05-16 22:14 ` [PATCH 2/4] staging/wlan-ng: compare using ether_addr_equal_unaligned Denis Pithon
2014-05-16 22:14 ` [PATCH 3/4] staging/wlan-ng: multicast address checking Denis Pithon
2014-05-16 22:14 ` [PATCH 4/4] staging/wlan-ng: rearrange comments Denis Pithon
2014-05-16 22:30 ` [PATCH 1/4] staging/wlan-ng: add prefix to function name Denis Pithon
2014-05-12 15:22 ` Denis Pithon [this message]
2014-05-14 11:57 ` [PATCH 4/4] staging/wlan-ng: replace printk() with pr_xxx() Dan Carpenter
2014-05-15 21:57 ` Greg KH
2014-05-16 22:24 ` [PATCH] staging/wlan-ng: log with netdev_xxx and dev_xxx Denis Pithon
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1399908167-19271-4-git-send-email-denis.pithon@gmail.com \
--to=denis.pithon@gmail.com \
--cc=devel@driverdev.osuosl.org \
--cc=gregkh@linuxfoundation.org \
--cc=himangi774@gmail.com \
--cc=linux-kernel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox