* [PATCH] staging: wlan-ng: prism2usb.c: fix printk(KERN_ERR... to pr_err(...
@ 2013-03-25 19:02 Nick Østergaard
2013-03-25 19:17 ` Greg KH
0 siblings, 1 reply; 3+ messages in thread
From: Nick Østergaard @ 2013-03-25 19:02 UTC (permalink / raw)
To: gregkh; +Cc: devel, linux-kernel, Nick Østergaard
Fixed checkpatch.pl warning, changing fix printk(KERN_ERR... to
pr_err(...
Signed-off-by: Nick Østergaard <oe.nick@gmail.com>
---
drivers/staging/wlan-ng/prism2usb.c | 12 +++++-------
1 file changed, 5 insertions(+), 7 deletions(-)
diff --git a/drivers/staging/wlan-ng/prism2usb.c b/drivers/staging/wlan-ng/prism2usb.c
index b1aed1f..0f2706a 100644
--- a/drivers/staging/wlan-ng/prism2usb.c
+++ b/drivers/staging/wlan-ng/prism2usb.c
@@ -113,14 +113,14 @@ static int prism2sta_probe_usb(struct usb_interface *interface,
dev = interface_to_usbdev(interface);
wlandev = create_wlan();
if (wlandev == NULL) {
- printk(KERN_ERR "%s: Memory allocation failure.\n", dev_info);
+ pr_err("%s: Memory allocation failure.\n", dev_info);
result = -EIO;
goto failed;
}
hw = wlandev->priv;
if (wlan_setup(wlandev, &(interface->dev)) != 0) {
- printk(KERN_ERR "%s: wlan_setup() failed.\n", dev_info);
+ pr_err("%s: wlan_setup() failed.\n", dev_info);
result = -EIO;
goto failed;
}
@@ -143,8 +143,7 @@ static int prism2sta_probe_usb(struct usb_interface *interface,
unregister_wlandev(wlandev);
hfa384x_destroy(hw);
result = -EIO;
- printk(KERN_ERR
- "%s: hfa384x_corereset() failed.\n", dev_info);
+ pr_err("%s: hfa384x_corereset() failed.\n", dev_info);
goto failed;
}
}
@@ -158,7 +157,7 @@ static int prism2sta_probe_usb(struct usb_interface *interface,
prism2sta_ifstate(wlandev, P80211ENUM_ifstate_enable);
if (register_wlandev(wlandev) != 0) {
- printk(KERN_ERR "%s: register_wlandev() failed.\n", dev_info);
+ pr_err("%s: register_wlandev() failed.\n", dev_info);
result = -EIO;
goto failed;
}
@@ -329,8 +328,7 @@ static int prism2sta_resume(struct usb_interface *interface)
if (result != 0) {
unregister_wlandev(wlandev);
hfa384x_destroy(hw);
- printk(KERN_ERR
- "%s: hfa384x_corereset() failed.\n", dev_info);
+ pr_err("%s: hfa384x_corereset() failed.\n", dev_info);
kfree(wlandev);
kfree(hw);
wlandev = NULL;
--
1.8.2
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH] staging: wlan-ng: prism2usb.c: fix printk(KERN_ERR... to pr_err(...
2013-03-25 19:02 [PATCH] staging: wlan-ng: prism2usb.c: fix printk(KERN_ERR... to pr_err( Nick Østergaard
@ 2013-03-25 19:17 ` Greg KH
2013-03-26 13:17 ` [PATCH] staging: wlan-ng: prism2usb.c: fix printk(KERN_ERR... to dev_err(dev, Nick Østergaard
0 siblings, 1 reply; 3+ messages in thread
From: Greg KH @ 2013-03-25 19:17 UTC (permalink / raw)
To: Nick Østergaard; +Cc: devel, linux-kernel
On Mon, Mar 25, 2013 at 08:02:28PM +0100, Nick Østergaard wrote:
> Fixed checkpatch.pl warning, changing fix printk(KERN_ERR... to
> pr_err(...
>
> Signed-off-by: Nick Østergaard <oe.nick@gmail.com>
> ---
> drivers/staging/wlan-ng/prism2usb.c | 12 +++++-------
> 1 file changed, 5 insertions(+), 7 deletions(-)
>
> diff --git a/drivers/staging/wlan-ng/prism2usb.c b/drivers/staging/wlan-ng/prism2usb.c
> index b1aed1f..0f2706a 100644
> --- a/drivers/staging/wlan-ng/prism2usb.c
> +++ b/drivers/staging/wlan-ng/prism2usb.c
> @@ -113,14 +113,14 @@ static int prism2sta_probe_usb(struct usb_interface *interface,
> dev = interface_to_usbdev(interface);
> wlandev = create_wlan();
> if (wlandev == NULL) {
> - printk(KERN_ERR "%s: Memory allocation failure.\n", dev_info);
> + pr_err("%s: Memory allocation failure.\n", dev_info);
Please use dev_err() instead, as you do have a valid struct device in
which to use.
thanks,
greg k-h
^ permalink raw reply [flat|nested] 3+ messages in thread
* [PATCH] staging: wlan-ng: prism2usb.c: fix printk(KERN_ERR... to dev_err(dev, ...
2013-03-25 19:17 ` Greg KH
@ 2013-03-26 13:17 ` Nick Østergaard
0 siblings, 0 replies; 3+ messages in thread
From: Nick Østergaard @ 2013-03-26 13:17 UTC (permalink / raw)
To: gregkh; +Cc: devel, linux-kernel, Nick Østergaard
Fix checkpatch warning. Change printk(KERN_ERR ... to dev_err(dev ...
Signed-off-by: Nick Østergaard <oe.nick@gmail.com>
---
drivers/staging/wlan-ng/prism2usb.c | 12 +++++-------
1 file changed, 5 insertions(+), 7 deletions(-)
diff --git a/drivers/staging/wlan-ng/prism2usb.c b/drivers/staging/wlan-ng/prism2usb.c
index b1aed1f..b401974 100644
--- a/drivers/staging/wlan-ng/prism2usb.c
+++ b/drivers/staging/wlan-ng/prism2usb.c
@@ -113,14 +113,14 @@ static int prism2sta_probe_usb(struct usb_interface *interface,
dev = interface_to_usbdev(interface);
wlandev = create_wlan();
if (wlandev == NULL) {
- printk(KERN_ERR "%s: Memory allocation failure.\n", dev_info);
+ dev_err(&interface->dev, "Memory allocation failure.\n");
result = -EIO;
goto failed;
}
hw = wlandev->priv;
if (wlan_setup(wlandev, &(interface->dev)) != 0) {
- printk(KERN_ERR "%s: wlan_setup() failed.\n", dev_info);
+ dev_err(&interface->dev, "wlan_setup() failed.\n");
result = -EIO;
goto failed;
}
@@ -143,8 +143,7 @@ static int prism2sta_probe_usb(struct usb_interface *interface,
unregister_wlandev(wlandev);
hfa384x_destroy(hw);
result = -EIO;
- printk(KERN_ERR
- "%s: hfa384x_corereset() failed.\n", dev_info);
+ dev_err(&interface->dev, "hfa384x_corereset() failed.\n");
goto failed;
}
}
@@ -158,7 +157,7 @@ static int prism2sta_probe_usb(struct usb_interface *interface,
prism2sta_ifstate(wlandev, P80211ENUM_ifstate_enable);
if (register_wlandev(wlandev) != 0) {
- printk(KERN_ERR "%s: register_wlandev() failed.\n", dev_info);
+ dev_err(&interface->dev, "register_wlandev() failed.\n");
result = -EIO;
goto failed;
}
@@ -329,8 +328,7 @@ static int prism2sta_resume(struct usb_interface *interface)
if (result != 0) {
unregister_wlandev(wlandev);
hfa384x_destroy(hw);
- printk(KERN_ERR
- "%s: hfa384x_corereset() failed.\n", dev_info);
+ dev_err(&interface->dev, "hfa384x_corereset() failed.\n");
kfree(wlandev);
kfree(hw);
wlandev = NULL;
--
1.8.2
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2013-03-26 13:17 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-03-25 19:02 [PATCH] staging: wlan-ng: prism2usb.c: fix printk(KERN_ERR... to pr_err( Nick Østergaard
2013-03-25 19:17 ` Greg KH
2013-03-26 13:17 ` [PATCH] staging: wlan-ng: prism2usb.c: fix printk(KERN_ERR... to dev_err(dev, Nick Østergaard
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox