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

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

USB: legousbtower.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: Juergen Stuber <starblue@users.sourceforge.net>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent b22862e5

drivers/usb/misc/legousbtower.c

+25 −20
Original line number Diff line number Diff line
@@ -354,7 +354,7 @@ static int tower_open (struct inode *inode, struct file *file) 
	interface = usb_find_interface (&tower_driver, subminor);



	if (!interface) {

		err ("%s - error, can't find device for minor %d",

		printk(KERN_ERR "%s - error, can't find device for minor %d\n",

		       __func__, subminor);

		retval = -ENODEV;

		goto exit;
@@ -397,7 +397,8 @@ static int tower_open (struct inode *inode, struct file *file) 
				  sizeof(reset_reply),

				  1000);

	if (result < 0) {

		err("LEGO USB Tower reset control request failed");

		dev_err(&dev->udev->dev,

			"LEGO USB Tower reset control request failed\n");

		retval = result;

		goto unlock_exit;

	}
@@ -420,7 +421,8 @@ static int tower_open (struct inode *inode, struct file *file) 


	retval = usb_submit_urb (dev->interrupt_in_urb, GFP_KERNEL);

	if (retval) {

		err("Couldn't submit interrupt_in_urb %d", retval);

		dev_err(&dev->udev->dev,

			"Couldn't submit interrupt_in_urb %d\n", retval);

		dev->interrupt_in_running = 0;

		dev->open_count = 0;

		goto unlock_exit;
@@ -608,7 +610,7 @@ static ssize_t tower_read (struct file *file, char __user *buffer, size_t count, 
	/* verify that the device wasn't unplugged */

	if (dev->udev == NULL) {

		retval = -ENODEV;

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

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

		goto unlock_exit;

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

	if (dev->udev == NULL) {

		retval = -ENODEV;

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

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

		goto unlock_exit;

	}
@@ -744,7 +746,8 @@ static ssize_t tower_write (struct file *file, const char __user *buffer, size_t 
	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", retval);

		dev_err(&dev->udev->dev,

			"Couldn't submit interrupt_out_urb %d\n", retval);

		goto unlock_exit;

	}

	retval = bytes_to_write;
@@ -803,9 +806,10 @@ static void tower_interrupt_in_callback (struct urb *urb) 
	/* resubmit if we're still running */

	if (dev->interrupt_in_running && dev->udev) {

		retval = usb_submit_urb (dev->interrupt_in_urb, GFP_ATOMIC);

		if (retval) {

			err("%s: usb_submit_urb failed (%d)", __func__, retval);

		}

		if (retval)

			dev_err(&dev->udev->dev,

				"%s: usb_submit_urb failed (%d)\n",

				__func__, retval);

	}



exit:
@@ -852,6 +856,7 @@ static void tower_interrupt_out_callback (struct urb *urb) 
 */

static int tower_probe (struct usb_interface *interface, const struct usb_device_id *id)

{

	struct device *idev = &interface->dev;

	struct usb_device *udev = interface_to_usbdev(interface);

	struct lego_usb_tower *dev = NULL;

	struct usb_host_interface *iface_desc;
@@ -871,7 +876,7 @@ static int tower_probe (struct usb_interface *interface, const struct usb_device 
	dev = kmalloc (sizeof(struct lego_usb_tower), GFP_KERNEL);



	if (dev == NULL) {

		err ("Out of memory");

		dev_err(idev, "Out of memory\n");

		goto exit;

	}
@@ -915,37 +920,37 @@ static int tower_probe (struct usb_interface *interface, const struct usb_device 
		}

	}

	if(dev->interrupt_in_endpoint == NULL) {

		err("interrupt in endpoint not found");

		dev_err(idev, "interrupt in endpoint not found\n");

		goto error;

	}

	if (dev->interrupt_out_endpoint == NULL) {

		err("interrupt out endpoint not found");

		dev_err(idev, "interrupt out endpoint not found\n");

		goto error;

	}



	dev->read_buffer = kmalloc (read_buffer_size, GFP_KERNEL);

	if (!dev->read_buffer) {

		err("Couldn't allocate read_buffer");

		dev_err(idev, "Couldn't allocate read_buffer\n");

		goto error;

	}

	dev->interrupt_in_buffer = kmalloc (usb_endpoint_maxp(dev->interrupt_in_endpoint), GFP_KERNEL);

	if (!dev->interrupt_in_buffer) {

		err("Couldn't allocate interrupt_in_buffer");

		dev_err(idev, "Couldn't allocate interrupt_in_buffer\n");

		goto error;

	}

	dev->interrupt_in_urb = usb_alloc_urb(0, GFP_KERNEL);

	if (!dev->interrupt_in_urb) {

		err("Couldn't allocate interrupt_in_urb");

		dev_err(idev, "Couldn't allocate interrupt_in_urb\n");

		goto error;

	}

	dev->interrupt_out_buffer = kmalloc (write_buffer_size, GFP_KERNEL);

	if (!dev->interrupt_out_buffer) {

		err("Couldn't allocate interrupt_out_buffer");

		dev_err(idev, "Couldn't allocate interrupt_out_buffer\n");

		goto error;

	}

	dev->interrupt_out_urb = usb_alloc_urb(0, GFP_KERNEL);

	if (!dev->interrupt_out_urb) {

		err("Couldn't allocate interrupt_out_urb");

		dev_err(idev, "Couldn't allocate interrupt_out_urb\n");

		goto error;

	}

	dev->interrupt_in_interval = interrupt_in_interval ? interrupt_in_interval : dev->interrupt_in_endpoint->bInterval;
@@ -958,7 +963,7 @@ static int tower_probe (struct usb_interface *interface, const struct usb_device 


	if (retval) {

		/* something prevented us from registering this driver */

		err ("Not able to get a minor for this device.");

		dev_err(idev, "Not able to get a minor for this device.\n");

		usb_set_intfdata (interface, NULL);

		goto error;

	}
@@ -980,7 +985,7 @@ static int tower_probe (struct usb_interface *interface, const struct usb_device 
				  sizeof(get_version_reply),

				  1000);

	if (result < 0) {

		err("LEGO USB Tower get version control request failed");

		dev_err(idev, "LEGO USB Tower get version control request failed\n");

		retval = result;

		goto error;

	}