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

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

USB: rio500.c: remove dbg() usage 



dbg() was a very old USB-specific macro that should no longer
be used. This patch removes it from being used in the driver
and uses dev_dbg() instead.

CC: Cesar Miquel <miquel@df.uba.ar>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent a341c6b2

drivers/usb/misc/rio500.c

+21 −16
Original line number Diff line number Diff line
@@ -153,8 +153,8 @@ static long ioctl_rio(struct file *file, unsigned int cmd, unsigned long arg) 


		requesttype = rio_cmd.requesttype | USB_DIR_IN |

		    USB_TYPE_VENDOR | USB_RECIP_DEVICE;

		dbg

		    ("sending command:reqtype=%0x req=%0x value=%0x index=%0x len=%0x",

		dev_dbg(&rio->rio_dev->dev,

			"sending command:reqtype=%0x req=%0x value=%0x index=%0x len=%0x\n",

			requesttype, rio_cmd.request, rio_cmd.value,

			rio_cmd.index, rio_cmd.length);

		/* Send rio control message */
@@ -176,7 +176,8 @@ static long ioctl_rio(struct file *file, unsigned int cmd, unsigned long arg) 
					result);

				retries = 0;

			} else {

				dbg("Executed ioctl. Result = %d (data=%02x)",

				dev_dbg(&rio->rio_dev->dev,

					"Executed ioctl. Result = %d (data=%02x)\n",

					result, buffer[0]);

				if (copy_to_user(rio_cmd.buffer, buffer,

						 rio_cmd.length)) {
@@ -223,7 +224,8 @@ static long ioctl_rio(struct file *file, unsigned int cmd, unsigned long arg) 


		requesttype = rio_cmd.requesttype | USB_DIR_OUT |

		    USB_TYPE_VENDOR | USB_RECIP_DEVICE;

		dbg("sending command: reqtype=%0x req=%0x value=%0x index=%0x len=%0x",

		dev_dbg(&rio->rio_dev->dev,

			"sending command: reqtype=%0x req=%0x value=%0x index=%0x len=%0x\n",

			requesttype, rio_cmd.request, rio_cmd.value,

			rio_cmd.index, rio_cmd.length);

		/* Send rio control message */
@@ -245,7 +247,8 @@ static long ioctl_rio(struct file *file, unsigned int cmd, unsigned long arg) 
					result);

				retries = 0;

			} else {

				dbg("Executed ioctl. Result = %d", result);

				dev_dbg(&rio->rio_dev->dev,

					"Executed ioctl. Result = %d\n", result);

				retries = 0;



			}
@@ -317,7 +320,8 @@ write_rio(struct file *file, const char __user *buffer, 
					 usb_sndbulkpipe(rio->rio_dev, 2),

					 obuf, thistime, &partial, 5000);



			dbg("write stats: result:%d thistime:%lu partial:%u",

			dev_dbg(&rio->rio_dev->dev,

				"write stats: result:%d thistime:%lu partial:%u\n",

				result, thistime, partial);



			if (result == -ETIMEDOUT) {	/* NAK - so hold for a while */
@@ -398,7 +402,8 @@ read_rio(struct file *file, char __user *buffer, size_t count, loff_t * ppos) 
				      ibuf, this_read, &partial,

				      8000);



		dbg("read stats: result:%d this_read:%u partial:%u",

		dev_dbg(&rio->rio_dev->dev,

			"read stats: result:%d this_read:%u partial:%u\n",

			result, this_read, partial);



		if (partial) {
@@ -479,7 +484,7 @@ static int probe_rio(struct usb_interface *intf, 
		usb_deregister_dev(intf, &usb_rio_class);

		return -ENOMEM;

	}

	dbg("probe_rio: obuf address:%p", rio->obuf);

	dev_dbg(&intf->dev, "obuf address:%p\n", rio->obuf);



	if (!(rio->ibuf = kmalloc(IBUF_SIZE, GFP_KERNEL))) {

		dev_err(&dev->dev,
@@ -488,7 +493,7 @@ static int probe_rio(struct usb_interface *intf, 
		kfree(rio->obuf);

		return -ENOMEM;

	}

	dbg("probe_rio: ibuf address:%p", rio->ibuf);

	dev_dbg(&intf->dev, "ibuf address:%p\n", rio->ibuf);



	mutex_init(&(rio->lock));