summaryrefslogtreecommitdiff
path: root/drivers/staging/wlan-ng
diff options
context:
space:
mode:
authorNick Østergaard <oe.nick@gmail.com>2013-03-26 14:17:10 +0100
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-03-26 16:13:20 -0700
commit318e16b920ce9ad84ee4f715aea7702dd72624ff (patch)
treea33404cd3291b9909cf47830b2f864c1718c1b47 /drivers/staging/wlan-ng
parentba0e60d18c5940ed6e9c58e61b7747e7170b6fbb (diff)
downloadlinux-3.10-318e16b920ce9ad84ee4f715aea7702dd72624ff.tar.gz
linux-3.10-318e16b920ce9ad84ee4f715aea7702dd72624ff.tar.bz2
linux-3.10-318e16b920ce9ad84ee4f715aea7702dd72624ff.zip
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 <oe.nick@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/wlan-ng')
-rw-r--r--drivers/staging/wlan-ng/prism2usb.c12
1 files changed, 5 insertions, 7 deletions
diff --git a/drivers/staging/wlan-ng/prism2usb.c b/drivers/staging/wlan-ng/prism2usb.c
index b1aed1f1f74..b401974fb28 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;