Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b22862e5 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

USB: ldusb.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: Michael Hund <mhund@ld-didactic.de>
CC: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
CC: Sarah Sharp <sarah.a.sharp@linux.intel.com>
CC: Felipe Balbi <balbi@ti.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 1c2eef03

drivers/usb/misc/ldusb.c

+9 −6
Original line number Diff line number Diff line
@@ -334,7 +334,7 @@ static int ld_usb_open(struct inode *inode, struct file *file) 
	interface = usb_find_interface(&ld_usb_driver, subminor);



	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);

		return -ENODEV;

	}
@@ -485,7 +485,7 @@ static ssize_t ld_usb_read(struct file *file, char __user *buffer, size_t count, 
	/* verify that the device wasn't unplugged */

	if (dev->intf == NULL) {

		retval = -ENODEV;

		err("No device or device unplugged %d\n", retval);

		printk(KERN_ERR "ldusb: No device or device unplugged %d\n", retval);

		goto unlock_exit;

	}
@@ -565,7 +565,7 @@ static ssize_t ld_usb_write(struct file *file, const char __user *buffer, 
	/* verify that the device wasn't unplugged */

	if (dev->intf == NULL) {

		retval = -ENODEV;

		err("No device or device unplugged %d\n", retval);

		printk(KERN_ERR "ldusb: No device or device unplugged %d\n", retval);

		goto unlock_exit;

	}
@@ -603,7 +603,9 @@ static ssize_t ld_usb_write(struct file *file, const char __user *buffer, 
					 bytes_to_write,

					 USB_CTRL_SET_TIMEOUT * HZ);

		if (retval < 0)

			err("Couldn't submit HID_REQ_SET_REPORT %d\n", retval);

			dev_err(&dev->intf->dev,

				"Couldn't submit HID_REQ_SET_REPORT %d\n",

				retval);

		goto unlock_exit;

	}
@@ -624,7 +626,8 @@ static ssize_t ld_usb_write(struct file *file, const char __user *buffer, 
	retval = usb_submit_urb(dev->interrupt_out_urb, GFP_KERNEL);

	if (retval) {

		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);

		goto unlock_exit;

	}

	retval = bytes_to_write;