staging: wlan-ng: prism2usb.c: fix printk(KERN_ERR... to pr_err(...
PATCH 1/1 staging: wlan-ng: prism2usb.c: fix printk(KERN_ERR... to pr_err(...
Fixed checkpatch.pl warning, changing fix printk(KERN_ERR... to pr_err(...
Signed-off-by Nick Østergaard <[email protected]>
--- drivers/staging/wlan-ng/prism2usb.c | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-)
drivers/staging/wlan-ng/prism2usb.c +5 -7
@@ -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 ;
Signature · 1 line
1.8.2
Greg KH
maintainerQuoted 13 lines · Nick Østergaard
Fixed checkpatch.pl warning, changing fix printk(KERN_ERR... to pr_err(...
Signed-off-by Nick Østergaard <[email protected]>--- drivers/staging/wlan-ng/prism2usb.c | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-)drivers/staging/wlan-ng/prism2usb.c +0
-0
drivers/staging/wlan-ng/prism2usb.c static int prism2sta_probe_usb(struct usb_interface *interface, · line 116
Quoted 5 lines
drivers/staging/wlan-ng/prism2usb.c +1
-1@@ -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
PATCH 1/1 staging: wlan-ng: prism2usb.c: fix printk(KERN_ERR... to dev_err(dev, ...
Fix checkpatch warning. Change printk(KERN_ERR ... to dev_err(dev ...
Signed-off-by Nick Østergaard <[email protected]>
--- drivers/staging/wlan-ng/prism2usb.c | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-)
drivers/staging/wlan-ng/prism2usb.c +5 -7
@@ -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 ;
Signature · 1 line
1.8.2