Commit 6e42a158 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman

USB: adutux: remove unneeded tracing macros

Remove the unneeded tracing macros in this driver.  The kernel has a
built-in trace function that can be used if this is really still needed.
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 38726bf5
...@@ -147,11 +147,9 @@ static void adu_abort_transfers(struct adu_device *dev) ...@@ -147,11 +147,9 @@ static void adu_abort_transfers(struct adu_device *dev)
{ {
unsigned long flags; unsigned long flags;
dbg(2, " %s : enter", __func__);
if (dev->udev == NULL) { if (dev->udev == NULL) {
dbg(1, " %s : udev is null", __func__); dbg(1, " %s : udev is null", __func__);
goto exit; return;
} }
/* shutdown transfer */ /* shutdown transfer */
...@@ -170,15 +168,10 @@ static void adu_abort_transfers(struct adu_device *dev) ...@@ -170,15 +168,10 @@ static void adu_abort_transfers(struct adu_device *dev)
usb_kill_urb(dev->interrupt_out_urb); usb_kill_urb(dev->interrupt_out_urb);
} else } else
spin_unlock_irqrestore(&dev->buflock, flags); spin_unlock_irqrestore(&dev->buflock, flags);
exit:
dbg(2, " %s : leave", __func__);
} }
static void adu_delete(struct adu_device *dev) static void adu_delete(struct adu_device *dev)
{ {
dbg(2, "%s enter", __func__);
/* free data structures */ /* free data structures */
usb_free_urb(dev->interrupt_in_urb); usb_free_urb(dev->interrupt_in_urb);
usb_free_urb(dev->interrupt_out_urb); usb_free_urb(dev->interrupt_out_urb);
...@@ -187,8 +180,6 @@ static void adu_delete(struct adu_device *dev) ...@@ -187,8 +180,6 @@ static void adu_delete(struct adu_device *dev)
kfree(dev->interrupt_in_buffer); kfree(dev->interrupt_in_buffer);
kfree(dev->interrupt_out_buffer); kfree(dev->interrupt_out_buffer);
kfree(dev); kfree(dev);
dbg(2, "%s : leave", __func__);
} }
static void adu_interrupt_in_callback(struct urb *urb) static void adu_interrupt_in_callback(struct urb *urb)
...@@ -196,7 +187,6 @@ static void adu_interrupt_in_callback(struct urb *urb) ...@@ -196,7 +187,6 @@ static void adu_interrupt_in_callback(struct urb *urb)
struct adu_device *dev = urb->context; struct adu_device *dev = urb->context;
int status = urb->status; int status = urb->status;
dbg(4, " %s : enter, status %d", __func__, status);
adu_debug_data(5, __func__, urb->actual_length, adu_debug_data(5, __func__, urb->actual_length,
urb->transfer_buffer); urb->transfer_buffer);
...@@ -234,7 +224,6 @@ static void adu_interrupt_in_callback(struct urb *urb) ...@@ -234,7 +224,6 @@ static void adu_interrupt_in_callback(struct urb *urb)
wake_up_interruptible(&dev->read_wait); wake_up_interruptible(&dev->read_wait);
adu_debug_data(5, __func__, urb->actual_length, adu_debug_data(5, __func__, urb->actual_length,
urb->transfer_buffer); urb->transfer_buffer);
dbg(4, " %s : leave, status %d", __func__, status);
} }
static void adu_interrupt_out_callback(struct urb *urb) static void adu_interrupt_out_callback(struct urb *urb)
...@@ -242,7 +231,6 @@ static void adu_interrupt_out_callback(struct urb *urb) ...@@ -242,7 +231,6 @@ static void adu_interrupt_out_callback(struct urb *urb)
struct adu_device *dev = urb->context; struct adu_device *dev = urb->context;
int status = urb->status; int status = urb->status;
dbg(4, " %s : enter, status %d", __func__, status);
adu_debug_data(5, __func__, urb->actual_length, urb->transfer_buffer); adu_debug_data(5, __func__, urb->actual_length, urb->transfer_buffer);
if (status != 0) { if (status != 0) {
...@@ -262,7 +250,6 @@ static void adu_interrupt_out_callback(struct urb *urb) ...@@ -262,7 +250,6 @@ static void adu_interrupt_out_callback(struct urb *urb)
adu_debug_data(5, __func__, urb->actual_length, adu_debug_data(5, __func__, urb->actual_length,
urb->transfer_buffer); urb->transfer_buffer);
dbg(4, " %s : leave, status %d", __func__, status);
} }
static int adu_open(struct inode *inode, struct file *file) static int adu_open(struct inode *inode, struct file *file)
...@@ -272,8 +259,6 @@ static int adu_open(struct inode *inode, struct file *file) ...@@ -272,8 +259,6 @@ static int adu_open(struct inode *inode, struct file *file)
int subminor; int subminor;
int retval; int retval;
dbg(2, "%s : enter", __func__);
subminor = iminor(inode); subminor = iminor(inode);
retval = mutex_lock_interruptible(&adutux_mutex); retval = mutex_lock_interruptible(&adutux_mutex);
...@@ -333,14 +318,11 @@ static int adu_open(struct inode *inode, struct file *file) ...@@ -333,14 +318,11 @@ static int adu_open(struct inode *inode, struct file *file)
exit_no_device: exit_no_device:
mutex_unlock(&adutux_mutex); mutex_unlock(&adutux_mutex);
exit_no_lock: exit_no_lock:
dbg(2, "%s : leave, return value %d ", __func__, retval);
return retval; return retval;
} }
static void adu_release_internal(struct adu_device *dev) static void adu_release_internal(struct adu_device *dev)
{ {
dbg(2, " %s : enter", __func__);
/* 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); dbg(2, " %s : open count %d", __func__, dev->open_count);
...@@ -348,8 +330,6 @@ static void adu_release_internal(struct adu_device *dev) ...@@ -348,8 +330,6 @@ static void adu_release_internal(struct adu_device *dev)
adu_abort_transfers(dev); adu_abort_transfers(dev);
dev->open_count = 0; dev->open_count = 0;
} }
dbg(2, " %s : leave", __func__);
} }
static int adu_release(struct inode *inode, struct file *file) static int adu_release(struct inode *inode, struct file *file)
...@@ -357,8 +337,6 @@ static int adu_release(struct inode *inode, struct file *file) ...@@ -357,8 +337,6 @@ static int adu_release(struct inode *inode, struct file *file)
struct adu_device *dev; struct adu_device *dev;
int retval = 0; int retval = 0;
dbg(2, " %s : enter", __func__);
if (file == NULL) { if (file == NULL) {
dbg(1, " %s : file is NULL", __func__); dbg(1, " %s : file is NULL", __func__);
retval = -ENODEV; retval = -ENODEV;
...@@ -389,7 +367,6 @@ static int adu_release(struct inode *inode, struct file *file) ...@@ -389,7 +367,6 @@ static int adu_release(struct inode *inode, struct file *file)
unlock: unlock:
mutex_unlock(&adutux_mutex); mutex_unlock(&adutux_mutex);
exit: exit:
dbg(2, " %s : leave, return value %d", __func__, retval);
return retval; return retval;
} }
...@@ -406,11 +383,7 @@ static ssize_t adu_read(struct file *file, __user char *buffer, size_t count, ...@@ -406,11 +383,7 @@ static ssize_t adu_read(struct file *file, __user char *buffer, size_t count,
unsigned long flags; unsigned long flags;
DECLARE_WAITQUEUE(wait, current); DECLARE_WAITQUEUE(wait, current);
dbg(2, " %s : enter, count = %Zd, file=%p", __func__, count, file);
dev = file->private_data; dev = file->private_data;
dbg(2, " %s : dev=%p", __func__, dev);
if (mutex_lock_interruptible(&dev->mtx)) if (mutex_lock_interruptible(&dev->mtx))
return -ERESTARTSYS; return -ERESTARTSYS;
...@@ -552,7 +525,6 @@ static ssize_t adu_read(struct file *file, __user char *buffer, size_t count, ...@@ -552,7 +525,6 @@ static ssize_t adu_read(struct file *file, __user char *buffer, size_t count,
/* unlock the device */ /* unlock the device */
mutex_unlock(&dev->mtx); mutex_unlock(&dev->mtx);
dbg(2, " %s : leave, return value %d", __func__, retval);
return retval; return retval;
} }
...@@ -567,8 +539,6 @@ static ssize_t adu_write(struct file *file, const __user char *buffer, ...@@ -567,8 +539,6 @@ static ssize_t adu_write(struct file *file, const __user char *buffer,
unsigned long flags; unsigned long flags;
int retval; int retval;
dbg(2, " %s : enter, count = %Zd", __func__, count);
dev = file->private_data; dev = file->private_data;
retval = mutex_lock_interruptible(&dev->mtx); retval = mutex_lock_interruptible(&dev->mtx);
...@@ -665,7 +635,6 @@ static ssize_t adu_write(struct file *file, const __user char *buffer, ...@@ -665,7 +635,6 @@ static ssize_t adu_write(struct file *file, const __user char *buffer,
exit: exit:
mutex_unlock(&dev->mtx); mutex_unlock(&dev->mtx);
exit_nolock: exit_nolock:
dbg(2, " %s : leave, return value %d", __func__, retval);
return retval; return retval;
exit_onqueue: exit_onqueue:
...@@ -711,8 +680,6 @@ static int adu_probe(struct usb_interface *interface, ...@@ -711,8 +680,6 @@ static int adu_probe(struct usb_interface *interface,
int out_end_size; int out_end_size;
int i; int i;
dbg(2, " %s : enter", __func__);
if (udev == NULL) { if (udev == NULL) {
dev_err(&interface->dev, "udev is NULL.\n"); dev_err(&interface->dev, "udev is NULL.\n");
goto exit; goto exit;
...@@ -833,8 +800,6 @@ static int adu_probe(struct usb_interface *interface, ...@@ -833,8 +800,6 @@ static int adu_probe(struct usb_interface *interface,
udev->descriptor.idProduct, dev->serial_number, udev->descriptor.idProduct, dev->serial_number,
(dev->minor - ADU_MINOR_BASE)); (dev->minor - ADU_MINOR_BASE));
exit: exit:
dbg(2, " %s : leave, return value %p (dev)", __func__, dev);
return retval; return retval;
error: error:
...@@ -852,8 +817,6 @@ static void adu_disconnect(struct usb_interface *interface) ...@@ -852,8 +817,6 @@ static void adu_disconnect(struct usb_interface *interface)
struct adu_device *dev; struct adu_device *dev;
int minor; int minor;
dbg(2, " %s : enter", __func__);
dev = usb_get_intfdata(interface); dev = usb_get_intfdata(interface);
mutex_lock(&dev->mtx); /* not interruptible */ mutex_lock(&dev->mtx); /* not interruptible */
...@@ -874,8 +837,6 @@ static void adu_disconnect(struct usb_interface *interface) ...@@ -874,8 +837,6 @@ static void adu_disconnect(struct usb_interface *interface)
dev_info(&interface->dev, "ADU device adutux%d now disconnected\n", dev_info(&interface->dev, "ADU device adutux%d now disconnected\n",
(minor - ADU_MINOR_BASE)); (minor - ADU_MINOR_BASE));
dbg(2, " %s : leave", __func__);
} }
/* usb specific object needed to register this driver with the usb subsystem */ /* usb specific object needed to register this driver with the usb subsystem */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment