mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-10-02 15:18:19 +00:00
Code Issues Releases Wiki Activity

USB: adutux: remove custom debug macro

Browse source 
Don't use a custom debug macro for just one driver, instead rely on the
in-kernel dynamic debugging logic, which can handle this much better.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Greg Kroah-Hartman 2013-06-26 16:30:44 -07:00
parent 6e42a15803
commit 66d4bc30d1
1 changed files with 58 additions and 39 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

97
drivers/usb/misc/adutux.c
View file

@ -147,10 +147,8 @@ static void adu_abort_transfers(struct adu_device *dev)
{ {
unsigned long flags; unsigned long flags;
if (dev->udev == NULL) { if (dev->udev == NULL)
dbg(1, " %s : udev is null", __func__);
return; return;
}
/* shutdown transfer */ /* shutdown transfer */
@ -195,8 +193,9 @@ static void adu_interrupt_in_callback(struct urb *urb)
if (status != 0) { if (status != 0) {
if ((status != -ENOENT) && (status != -ECONNRESET) && if ((status != -ENOENT) && (status != -ECONNRESET) &&
(status != -ESHUTDOWN)) { (status != -ESHUTDOWN)) {
dbg(1, " %s : nonzero status received: %d", dev_dbg(&dev->udev->dev,
__func__, status); "%s : nonzero status received: %d\n",
__func__, status);
} }
goto exit; goto exit;
} }
@ -210,10 +209,11 @@ static void adu_interrupt_in_callback(struct urb *urb)
dev->interrupt_in_buffer, urb->actual_length); dev->interrupt_in_buffer, urb->actual_length);
dev->read_buffer_length += urb->actual_length; dev->read_buffer_length += urb->actual_length;
dbg(2, " %s reading %d ", __func__, dev_dbg(&dev->udev->dev,"%s reading %d\n", __func__,
urb->actual_length); urb->actual_length);
} else { } else {
dbg(1, " %s : read_buffer overflow", __func__); dev_dbg(&dev->udev->dev,"%s : read_buffer overflow\n",
__func__);
} }
} }
@ -236,8 +236,9 @@ static void adu_interrupt_out_callback(struct urb *urb)
if (status != 0) { if (status != 0) {
if ((status != -ENOENT) && if ((status != -ENOENT) &&
(status != -ECONNRESET)) { (status != -ECONNRESET)) {
dbg(1, " %s :nonzero status received: %d", dev_dbg(&dev->udev->dev,
__func__, status); "%s :nonzero status received: %d\n", __func__,
status);
} }
goto exit; goto exit;
} }
@ -262,10 +263,8 @@ static int adu_open(struct inode *inode, struct file *file)
subminor = iminor(inode); subminor = iminor(inode);
retval = mutex_lock_interruptible(&adutux_mutex); retval = mutex_lock_interruptible(&adutux_mutex);
if (retval) { if (retval)
dbg(2, "%s : mutex lock failed", __func__);
goto exit_no_lock; goto exit_no_lock;
}
interface = usb_find_interface(&adu_driver, subminor); interface = usb_find_interface(&adu_driver, subminor);
if (!interface) { if (!interface) {
@ -288,7 +287,8 @@ static int adu_open(struct inode *inode, struct file *file)
} }
++dev->open_count; ++dev->open_count;
dbg(2, "%s : open count %d", __func__, dev->open_count); dev_dbg(&dev->udev->dev, "%s: open count %d\n", __func__,
dev->open_count);
/* save device in the file's private structure */ /* save device in the file's private structure */
file->private_data = dev; file->private_data = dev;
@ -325,7 +325,8 @@ static void adu_release_internal(struct adu_device *dev)
{ {
/* decrement our usage count for the device */ /* decrement our usage count for the device */
--dev->open_count; --dev->open_count;
dbg(2, " %s : open count %d", __func__, dev->open_count); dev_dbg(&dev->udev->dev, "%s : open count %d\n", __func__,
dev->open_count);
if (dev->open_count <= 0) { if (dev->open_count <= 0) {
adu_abort_transfers(dev); adu_abort_transfers(dev);
dev->open_count = 0; dev->open_count = 0;
@ -338,14 +339,12 @@ static int adu_release(struct inode *inode, struct file *file)
int retval = 0; int retval = 0;
if (file == NULL) { if (file == NULL) {
dbg(1, " %s : file is NULL", __func__);
retval = -ENODEV; retval = -ENODEV;
goto exit; goto exit;
} }
dev = file->private_data; dev = file->private_data;
if (dev == NULL) { if (dev == NULL) {
dbg(1, " %s : object is NULL", __func__);
retval = -ENODEV; retval = -ENODEV;
goto exit; goto exit;
} }
@ -353,7 +352,7 @@ static int adu_release(struct inode *inode, struct file *file)
mutex_lock(&adutux_mutex); /* not interruptible */ mutex_lock(&adutux_mutex); /* not interruptible */
if (dev->open_count <= 0) { if (dev->open_count <= 0) {
dbg(1, " %s : device not opened", __func__); dev_dbg(&dev->udev->dev, "%s : device not opened\n", __func__);
retval = -ENODEV; retval = -ENODEV;
goto unlock; goto unlock;
} }
@ -397,17 +396,19 @@ static ssize_t adu_read(struct file *file, __user char *buffer, size_t count,
/* verify that some data was requested */ /* verify that some data was requested */
if (count == 0) { if (count == 0) {
dbg(1, " %s : read request of 0 bytes", __func__); dev_dbg(&dev->udev->dev, "%s : read request of 0 bytes\n",
__func__);
goto exit; goto exit;
} }
timeout = COMMAND_TIMEOUT; timeout = COMMAND_TIMEOUT;
dbg(2, " %s : about to start looping", __func__); dev_dbg(&dev->udev->dev, "%s : about to start looping\n", __func__);
while (bytes_to_read) { while (bytes_to_read) {
int data_in_secondary = dev->secondary_tail - dev->secondary_head; int data_in_secondary = dev->secondary_tail - dev->secondary_head;
dbg(2, " %s : while, data_in_secondary=%d, status=%d", dev_dbg(&dev->udev->dev,
__func__, data_in_secondary, "%s : while, data_in_secondary=%d, status=%d\n",
dev->interrupt_in_urb->status); __func__, data_in_secondary,
dev->interrupt_in_urb->status);
if (data_in_secondary) { if (data_in_secondary) {
/* drain secondary buffer */ /* drain secondary buffer */
@ -430,8 +431,9 @@ static ssize_t adu_read(struct file *file, __user char *buffer, size_t count,
if (dev->read_buffer_length) { if (dev->read_buffer_length) {
/* we secure access to the primary */ /* we secure access to the primary */
char *tmp; char *tmp;
dbg(2, " %s : swap, read_buffer_length = %d", dev_dbg(&dev->udev->dev,
__func__, dev->read_buffer_length); "%s : swap, read_buffer_length = %d\n",
__func__, dev->read_buffer_length);
tmp = dev->read_buffer_secondary; tmp = dev->read_buffer_secondary;
dev->read_buffer_secondary = dev->read_buffer_primary; dev->read_buffer_secondary = dev->read_buffer_primary;
dev->read_buffer_primary = tmp; dev->read_buffer_primary = tmp;
@ -446,10 +448,14 @@ static ssize_t adu_read(struct file *file, __user char *buffer, size_t count,
if (!dev->read_urb_finished) { if (!dev->read_urb_finished) {
/* somebody is doing IO */ /* somebody is doing IO */
spin_unlock_irqrestore(&dev->buflock, flags); spin_unlock_irqrestore(&dev->buflock, flags);
dbg(2, " %s : submitted already", __func__); dev_dbg(&dev->udev->dev,
"%s : submitted already\n",
__func__);
} else { } else {
/* we must initiate input */ /* we must initiate input */
dbg(2, " %s : initiate input", __func__); dev_dbg(&dev->udev->dev,
"%s : initiate input\n",
__func__);
dev->read_urb_finished = 0; dev->read_urb_finished = 0;
spin_unlock_irqrestore(&dev->buflock, flags); spin_unlock_irqrestore(&dev->buflock, flags);
@ -467,7 +473,9 @@ static ssize_t adu_read(struct file *file, __user char *buffer, size_t count,
if (retval == -ENOMEM) { if (retval == -ENOMEM) {
retval = bytes_read ? bytes_read : -ENOMEM; retval = bytes_read ? bytes_read : -ENOMEM;
} }
dbg(2, " %s : submit failed", __func__); dev_dbg(&dev->udev->dev,
"%s : submit failed\n",
__func__);
goto exit; goto exit;
} }
} }
@ -486,13 +494,16 @@ static ssize_t adu_read(struct file *file, __user char *buffer, size_t count,
remove_wait_queue(&dev->read_wait, &wait); remove_wait_queue(&dev->read_wait, &wait);
if (timeout <= 0) { if (timeout <= 0) {
dbg(2, " %s : timeout", __func__); dev_dbg(&dev->udev->dev,
"%s : timeout\n", __func__);
retval = bytes_read ? bytes_read : -ETIMEDOUT; retval = bytes_read ? bytes_read : -ETIMEDOUT;
goto exit; goto exit;
} }
if (signal_pending(current)) { if (signal_pending(current)) {
dbg(2, " %s : signal pending", __func__); dev_dbg(&dev->udev->dev,
"%s : signal pending\n",
__func__);
retval = bytes_read ? bytes_read : -EINTR; retval = bytes_read ? bytes_read : -EINTR;
goto exit; goto exit;
} }
@ -555,7 +566,8 @@ static ssize_t adu_write(struct file *file, const __user char *buffer,
/* verify that we actually have some data to write */ /* verify that we actually have some data to write */
if (count == 0) { if (count == 0) {
dbg(1, " %s : write request of 0 bytes", __func__); dev_dbg(&dev->udev->dev, "%s : write request of 0 bytes\n",
__func__);
goto exit; goto exit;
} }
@ -568,13 +580,15 @@ static ssize_t adu_write(struct file *file, const __user char *buffer,
mutex_unlock(&dev->mtx); mutex_unlock(&dev->mtx);
if (signal_pending(current)) { if (signal_pending(current)) {
dbg(1, " %s : interrupted", __func__); dev_dbg(&dev->udev->dev, "%s : interrupted\n",
__func__);
set_current_state(TASK_RUNNING); set_current_state(TASK_RUNNING);
retval = -EINTR; retval = -EINTR;
goto exit_onqueue; goto exit_onqueue;
} }
if (schedule_timeout(COMMAND_TIMEOUT) == 0) { if (schedule_timeout(COMMAND_TIMEOUT) == 0) {
dbg(1, "%s - command timed out.", __func__); dev_dbg(&dev->udev->dev,
"%s - command timed out.\n", __func__);
retval = -ETIMEDOUT; retval = -ETIMEDOUT;
goto exit_onqueue; goto exit_onqueue;
} }
@ -585,18 +599,22 @@ static ssize_t adu_write(struct file *file, const __user char *buffer,
goto exit_nolock; goto exit_nolock;
} }
dbg(4, " %s : in progress, count = %Zd", __func__, count); dev_dbg(&dev->udev->dev,
"%s : in progress, count = %Zd\n",
__func__, count);
} else { } else {
spin_unlock_irqrestore(&dev->buflock, flags); spin_unlock_irqrestore(&dev->buflock, flags);
set_current_state(TASK_RUNNING); set_current_state(TASK_RUNNING);
remove_wait_queue(&dev->write_wait, &waita); remove_wait_queue(&dev->write_wait, &waita);
dbg(4, " %s : sending, count = %Zd", __func__, count); dev_dbg(&dev->udev->dev, "%s : sending, count = %Zd\n",
__func__, count);
/* write the data into interrupt_out_buffer from userspace */ /* write the data into interrupt_out_buffer from userspace */
buffer_size = usb_endpoint_maxp(dev->interrupt_out_endpoint); buffer_size = usb_endpoint_maxp(dev->interrupt_out_endpoint);
bytes_to_write = count > buffer_size ? buffer_size : count; bytes_to_write = count > buffer_size ? buffer_size : count;
dbg(4, " %s : buffer_size = %Zd, count = %Zd, bytes_to_write = %Zd", dev_dbg(&dev->udev->dev,
__func__, buffer_size, count, bytes_to_write); "%s : buffer_size = %Zd, count = %Zd, bytes_to_write = %Zd\n",
__func__, buffer_size, count, bytes_to_write);
if (copy_from_user(dev->interrupt_out_buffer, buffer, bytes_to_write) != 0) { if (copy_from_user(dev->interrupt_out_buffer, buffer, bytes_to_write) != 0) {
retval = -EFAULT; retval = -EFAULT;
@ -779,7 +797,7 @@ static int adu_probe(struct usb_interface *interface,
dev_err(&interface->dev, "Could not retrieve serial number\n"); dev_err(&interface->dev, "Could not retrieve serial number\n");
goto error; goto error;
} }
dbg(2, " %s : serial_number=%s", __func__, dev->serial_number); dev_dbg(&interface->dev,"serial_number=%s", dev->serial_number);
/* we can register the device now, as it is ready */ /* we can register the device now, as it is ready */
usb_set_intfdata(interface, dev); usb_set_intfdata(interface, dev);
@ -829,7 +847,8 @@ static void adu_disconnect(struct usb_interface *interface)
usb_set_intfdata(interface, NULL); usb_set_intfdata(interface, NULL);
/* if the device is not opened, then we clean up right now */ /* if the device is not opened, then we clean up right now */
dbg(2, " %s : open count %d", __func__, dev->open_count); dev_dbg(&dev->udev->dev, "%s : open count %d\n",
__func__, dev->open_count);
if (!dev->open_count) if (!dev->open_count)
adu_delete(dev); adu_delete(dev);