mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-06 10:57:46 +00:00
staging: frontier: alphatrack.c: remove err() usage
err() was a very old USB-specific macro that I thought had gone away. This patch removes it from being used in the driver and uses dev_err() instead. CC: "David Täht" <d@teklibre.com> CC: Hitoshi Nakamori <hitoshi.nakamori@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
parent
aec238825f
commit
f860b0cd8d
1 changed files with 9 additions and 6 deletions
|
@ -333,7 +333,7 @@ static int usb_alphatrack_open(struct inode *inode, struct file *file)
|
||||||
interface = usb_find_interface(&usb_alphatrack_driver, subminor);
|
interface = usb_find_interface(&usb_alphatrack_driver, subminor);
|
||||||
|
|
||||||
if (!interface) {
|
if (!interface) {
|
||||||
err("%s - error, can't find device for minor %d\n",
|
printk(KERN_ERR "%s - error, can't find device for minor %d\n",
|
||||||
__func__, subminor);
|
__func__, subminor);
|
||||||
retval = -ENODEV;
|
retval = -ENODEV;
|
||||||
goto unlock_disconnect_exit;
|
goto unlock_disconnect_exit;
|
||||||
|
@ -494,7 +494,8 @@ static ssize_t usb_alphatrack_read(struct file *file, char __user *buffer,
|
||||||
/* verify that the device wasn't unplugged */
|
/* verify that the device wasn't unplugged */
|
||||||
if (dev->intf == NULL) {
|
if (dev->intf == NULL) {
|
||||||
retval = -ENODEV;
|
retval = -ENODEV;
|
||||||
err("No device or device unplugged %d\n", retval);
|
printk(KERN_ERR "%s: No device or device unplugged %d\n",
|
||||||
|
__func__, retval);
|
||||||
goto unlock_exit;
|
goto unlock_exit;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -564,7 +565,8 @@ static ssize_t usb_alphatrack_write(struct file *file,
|
||||||
/* verify that the device wasn't unplugged */
|
/* verify that the device wasn't unplugged */
|
||||||
if (dev->intf == NULL) {
|
if (dev->intf == NULL) {
|
||||||
retval = -ENODEV;
|
retval = -ENODEV;
|
||||||
err("No device or device unplugged %d\n", retval);
|
printk(KERN_ERR "%s: No device or device unplugged %d\n",
|
||||||
|
__func__, retval);
|
||||||
goto unlock_exit;
|
goto unlock_exit;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -599,7 +601,7 @@ static ssize_t usb_alphatrack_write(struct file *file,
|
||||||
}
|
}
|
||||||
|
|
||||||
if (dev->interrupt_out_endpoint == NULL) {
|
if (dev->interrupt_out_endpoint == NULL) {
|
||||||
err("Endpoint should not be be null!\n");
|
dev_err(&dev->intf->dev, "Endpoint should not be be null!\n");
|
||||||
goto unlock_exit;
|
goto unlock_exit;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -619,7 +621,8 @@ static ssize_t usb_alphatrack_write(struct file *file,
|
||||||
retval = usb_submit_urb(dev->interrupt_out_urb, GFP_KERNEL);
|
retval = usb_submit_urb(dev->interrupt_out_urb, GFP_KERNEL);
|
||||||
if (retval) {
|
if (retval) {
|
||||||
dev->interrupt_out_busy = 0;
|
dev->interrupt_out_busy = 0;
|
||||||
err("Couldn't submit interrupt_out_urb %d\n", retval);
|
dev_err(&dev->intf->dev,
|
||||||
|
"Couldn't submit interrupt_out_urb %d\n", retval);
|
||||||
atomic_dec(&dev->writes_pending);
|
atomic_dec(&dev->writes_pending);
|
||||||
goto unlock_exit;
|
goto unlock_exit;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue