aboutsummaryrefslogtreecommitdiffstats
diff options
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-07-05 16:21:19 -0700
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-07-05 16:21:19 -0700
commitfba2e3a02ab610753189177babd75c68f070569e (patch)
tree5848b8b86022910386f4e55f5f07f3d4997b5b3d
parent08d2feaec62a45d40dc318b94ec3ea58599fbb0a (diff)
downloadpatches-fba2e3a02ab610753189177babd75c68f070569e.tar.gz
refresh
Diffstat
-rw-r--r--usb-adutux-remove-custom-debug-macro.patch50
-rw-r--r--usb-adutux-remove-unneeded-tracing-macros.patch76
2 files changed, 63 insertions, 63 deletions
diff --git a/usb-adutux-remove-custom-debug-macro.patch b/usb-adutux-remove-custom-debug-macro.patch
index 82102a623df3e9..bc089104927697 100644
--- a/usb-adutux-remove-custom-debug-macro.patch
+++ b/usb-adutux-remove-custom-debug-macro.patch
@@ -21,7 +21,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
unsigned long flags;
- if (dev->udev == NULL) {
-- dbg(1," %s : udev is null", __func__);
+- dbg(1, " %s : udev is null", __func__);
+ if (dev->udev == NULL)
return;
- }
@@ -32,7 +32,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
if (status != 0) {
if ((status != -ENOENT) && (status != -ECONNRESET) &&
(status != -ESHUTDOWN)) {
-- dbg(1," %s : nonzero status received: %d",
+- dbg(1, " %s : nonzero status received: %d",
- __func__, status);
+ dev_dbg(&dev->udev->dev,
+ "%s : nonzero status received: %d\n",
@@ -44,12 +44,12 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
dev->interrupt_in_buffer, urb->actual_length);
dev->read_buffer_length += urb->actual_length;
-- dbg(2," %s reading %d ", __func__,
+- dbg(2, " %s reading %d ", __func__,
- urb->actual_length);
+ dev_dbg(&dev->udev->dev,"%s reading %d\n", __func__,
+ urb->actual_length);
} else {
-- dbg(1," %s : read_buffer overflow", __func__);
+- dbg(1, " %s : read_buffer overflow", __func__);
+ dev_dbg(&dev->udev->dev,"%s : read_buffer overflow\n",
+ __func__);
}
@@ -83,7 +83,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
}
++dev->open_count;
-- dbg(2,"%s : open count %d", __func__, 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);
@@ -93,7 +93,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
{
/* decrement our usage count for the device */
--dev->open_count;
-- dbg(2," %s : open count %d", __func__, 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) {
@@ -103,14 +103,14 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
int retval = 0;
if (file == NULL) {
-- dbg(1," %s : file is NULL", __func__);
+- dbg(1, " %s : file is NULL", __func__);
retval = -ENODEV;
goto exit;
}
dev = file->private_data;
if (dev == NULL) {
-- dbg(1," %s : object is NULL", __func__);
+- dbg(1, " %s : object is NULL", __func__);
retval = -ENODEV;
goto exit;
}
@@ -118,7 +118,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
mutex_lock(&adutux_mutex); /* not interruptible */
if (dev->open_count <= 0) {
-- dbg(1," %s : device not opened", __func__);
+- dbg(1, " %s : device not opened", __func__);
+ dev_dbg(&dev->udev->dev, "%s : device not opened\n", __func__);
retval = -ENODEV;
goto unlock;
@@ -127,18 +127,18 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
/* verify that some data was requested */
if (count == 0) {
-- dbg(1," %s : read request of 0 bytes", __func__);
+- dbg(1, " %s : read request of 0 bytes", __func__);
+ dev_dbg(&dev->udev->dev, "%s : read request of 0 bytes\n",
+ __func__);
goto exit;
}
timeout = COMMAND_TIMEOUT;
-- dbg(2," %s : about to start looping", __func__);
+- dbg(2, " %s : about to start looping", __func__);
+ dev_dbg(&dev->udev->dev, "%s : about to start looping\n", __func__);
while (bytes_to_read) {
int data_in_secondary = dev->secondary_tail - dev->secondary_head;
-- dbg(2," %s : while, data_in_secondary=%d, status=%d",
+- dbg(2, " %s : while, data_in_secondary=%d, status=%d",
- __func__, data_in_secondary,
- dev->interrupt_in_urb->status);
+ dev_dbg(&dev->udev->dev,
@@ -152,7 +152,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
if (dev->read_buffer_length) {
/* we secure access to the primary */
char *tmp;
-- dbg(2," %s : swap, read_buffer_length = %d",
+- dbg(2, " %s : swap, read_buffer_length = %d",
- __func__, dev->read_buffer_length);
+ dev_dbg(&dev->udev->dev,
+ "%s : swap, read_buffer_length = %d\n",
@@ -164,13 +164,13 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
if (!dev->read_urb_finished) {
/* somebody is doing IO */
spin_unlock_irqrestore(&dev->buflock, flags);
-- dbg(2," %s : submitted already", __func__);
+- dbg(2, " %s : submitted already", __func__);
+ dev_dbg(&dev->udev->dev,
+ "%s : submitted already\n",
+ __func__);
} else {
/* we must initiate input */
-- dbg(2," %s : initiate input", __func__);
+- dbg(2, " %s : initiate input", __func__);
+ dev_dbg(&dev->udev->dev,
+ "%s : initiate input\n",
+ __func__);
@@ -181,7 +181,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
if (retval == -ENOMEM) {
retval = bytes_read ? bytes_read : -ENOMEM;
}
-- dbg(2," %s : submit failed", __func__);
+- dbg(2, " %s : submit failed", __func__);
+ dev_dbg(&dev->udev->dev,
+ "%s : submit failed\n",
+ __func__);
@@ -192,7 +192,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
remove_wait_queue(&dev->read_wait, &wait);
if (timeout <= 0) {
-- dbg(2," %s : timeout", __func__);
+- dbg(2, " %s : timeout", __func__);
+ dev_dbg(&dev->udev->dev,
+ "%s : timeout\n", __func__);
retval = bytes_read ? bytes_read : -ETIMEDOUT;
@@ -200,7 +200,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
}
if (signal_pending(current)) {
-- dbg(2," %s : signal pending", __func__);
+- dbg(2, " %s : signal pending", __func__);
+ dev_dbg(&dev->udev->dev,
+ "%s : signal pending\n",
+ __func__);
@@ -211,7 +211,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
/* verify that we actually have some data to write */
if (count == 0) {
-- dbg(1," %s : write request of 0 bytes", __func__);
+- dbg(1, " %s : write request of 0 bytes", __func__);
+ dev_dbg(&dev->udev->dev, "%s : write request of 0 bytes\n",
+ __func__);
goto exit;
@@ -221,7 +221,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
mutex_unlock(&dev->mtx);
if (signal_pending(current)) {
-- dbg(1," %s : interrupted", __func__);
+- dbg(1, " %s : interrupted", __func__);
+ dev_dbg(&dev->udev->dev, "%s : interrupted\n",
+ __func__);
set_current_state(TASK_RUNNING);
@@ -239,7 +239,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
goto exit_nolock;
}
-- dbg(4," %s : in progress, count = %Zd", __func__, count);
+- dbg(4, " %s : in progress, count = %Zd", __func__, count);
+ dev_dbg(&dev->udev->dev,
+ "%s : in progress, count = %Zd\n",
+ __func__, count);
@@ -247,14 +247,14 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
spin_unlock_irqrestore(&dev->buflock, flags);
set_current_state(TASK_RUNNING);
remove_wait_queue(&dev->write_wait, &waita);
-- dbg(4," %s : sending, count = %Zd", __func__, count);
+- 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 */
buffer_size = usb_endpoint_maxp(dev->interrupt_out_endpoint);
bytes_to_write = count > buffer_size ? buffer_size : count;
-- dbg(4," %s : buffer_size = %Zd, count = %Zd, bytes_to_write = %Zd",
+- dbg(4, " %s : buffer_size = %Zd, count = %Zd, bytes_to_write = %Zd",
- __func__, buffer_size, count, bytes_to_write);
+ dev_dbg(&dev->udev->dev,
+ "%s : buffer_size = %Zd, count = %Zd, bytes_to_write = %Zd\n",
@@ -266,7 +266,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
dev_err(&interface->dev, "Could not retrieve serial number\n");
goto error;
}
-- dbg(2," %s : serial_number=%s", __func__, dev->serial_number);
+- 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 */
@@ -275,7 +275,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
usb_set_intfdata(interface, NULL);
/* if the device is not opened, then we clean up right now */
-- dbg(2," %s : open count %d", __func__, 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)
diff --git a/usb-adutux-remove-unneeded-tracing-macros.patch b/usb-adutux-remove-unneeded-tracing-macros.patch
index d36b2d900c8190..8b26214ac16e42 100644
--- a/usb-adutux-remove-unneeded-tracing-macros.patch
+++ b/usb-adutux-remove-unneeded-tracing-macros.patch
@@ -20,10 +20,10 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
{
unsigned long flags;
-- dbg(2," %s : enter", __func__);
+- dbg(2, " %s : enter", __func__);
-
if (dev->udev == NULL) {
- dbg(1," %s : udev is null", __func__);
+ dbg(1, " %s : udev is null", __func__);
- goto exit;
+ return;
}
@@ -35,7 +35,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
spin_unlock_irqrestore(&dev->buflock, flags);
-
-exit:
-- dbg(2," %s : leave", __func__);
+- dbg(2, " %s : leave", __func__);
}
static void adu_delete(struct adu_device *dev)
@@ -58,7 +58,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
struct adu_device *dev = urb->context;
int status = urb->status;
-- dbg(4," %s : enter, status %d", __func__, status);
+- dbg(4, " %s : enter, status %d", __func__, status);
adu_debug_data(5, __func__, urb->actual_length,
urb->transfer_buffer);
@@ -66,7 +66,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
wake_up_interruptible(&dev->read_wait);
adu_debug_data(5, __func__, urb->actual_length,
urb->transfer_buffer);
-- dbg(4," %s : leave, status %d", __func__, status);
+- dbg(4, " %s : leave, status %d", __func__, status);
}
static void adu_interrupt_out_callback(struct urb *urb)
@@ -74,15 +74,15 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
struct adu_device *dev = urb->context;
int status = urb->status;
-- dbg(4," %s : enter, status %d", __func__, status);
- adu_debug_data(5,__func__, urb->actual_length, urb->transfer_buffer);
+- dbg(4, " %s : enter, status %d", __func__, status);
+ adu_debug_data(5, __func__, urb->actual_length, urb->transfer_buffer);
if (status != 0) {
@@ -262,7 +250,6 @@ exit:
adu_debug_data(5, __func__, urb->actual_length,
urb->transfer_buffer);
-- dbg(4," %s : leave, status %d", __func__, status);
+- dbg(4, " %s : leave, status %d", __func__, status);
}
static int adu_open(struct inode *inode, struct file *file)
@@ -90,122 +90,122 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
int subminor;
int retval;
-- dbg(2,"%s : enter", __func__);
+- dbg(2, "%s : enter", __func__);
-
subminor = iminor(inode);
- if ((retval = mutex_lock_interruptible(&adutux_mutex))) {
-@@ -332,14 +317,11 @@ static int adu_open(struct inode *inode,
+ retval = mutex_lock_interruptible(&adutux_mutex);
+@@ -333,14 +318,11 @@ static int adu_open(struct inode *inode,
exit_no_device:
mutex_unlock(&adutux_mutex);
exit_no_lock:
-- dbg(2,"%s : leave, return value %d ", __func__, retval);
+- dbg(2, "%s : leave, return value %d ", __func__, retval);
return retval;
}
static void adu_release_internal(struct adu_device *dev)
{
-- dbg(2," %s : enter", __func__);
+- dbg(2, " %s : enter", __func__);
-
/* decrement our usage count for the device */
--dev->open_count;
- dbg(2," %s : open count %d", __func__, dev->open_count);
-@@ -347,8 +329,6 @@ static void adu_release_internal(struct
+ dbg(2, " %s : open count %d", __func__, dev->open_count);
+@@ -348,8 +330,6 @@ static void adu_release_internal(struct
adu_abort_transfers(dev);
dev->open_count = 0;
}
-
-- dbg(2," %s : leave", __func__);
+- dbg(2, " %s : leave", __func__);
}
static int adu_release(struct inode *inode, struct file *file)
-@@ -356,8 +336,6 @@ static int adu_release(struct inode *ino
+@@ -357,8 +337,6 @@ static int adu_release(struct inode *ino
struct adu_device *dev;
int retval = 0;
-- dbg(2," %s : enter", __func__);
+- dbg(2, " %s : enter", __func__);
-
if (file == NULL) {
- dbg(1," %s : file is NULL", __func__);
+ dbg(1, " %s : file is NULL", __func__);
retval = -ENODEV;
-@@ -388,7 +366,6 @@ static int adu_release(struct inode *ino
+@@ -389,7 +367,6 @@ static int adu_release(struct inode *ino
unlock:
mutex_unlock(&adutux_mutex);
exit:
-- dbg(2," %s : leave, return value %d", __func__, retval);
+- dbg(2, " %s : leave, return value %d", __func__, retval);
return retval;
}
-@@ -405,11 +382,7 @@ static ssize_t adu_read(struct file *fil
+@@ -406,11 +383,7 @@ static ssize_t adu_read(struct file *fil
unsigned long flags;
DECLARE_WAITQUEUE(wait, current);
-- dbg(2," %s : enter, count = %Zd, file=%p", __func__, count, file);
+- dbg(2, " %s : enter, count = %Zd, file=%p", __func__, count, file);
-
dev = file->private_data;
-- dbg(2," %s : dev=%p", __func__, dev);
+- dbg(2, " %s : dev=%p", __func__, dev);
-
if (mutex_lock_interruptible(&dev->mtx))
return -ERESTARTSYS;
-@@ -551,7 +524,6 @@ exit:
+@@ -552,7 +525,6 @@ exit:
/* unlock the device */
mutex_unlock(&dev->mtx);
-- dbg(2," %s : leave, return value %d", __func__, retval);
+- dbg(2, " %s : leave, return value %d", __func__, retval);
return retval;
}
-@@ -566,8 +538,6 @@ static ssize_t adu_write(struct file *fi
+@@ -567,8 +539,6 @@ static ssize_t adu_write(struct file *fi
unsigned long flags;
int retval;
-- dbg(2," %s : enter, count = %Zd", __func__, count);
+- dbg(2, " %s : enter, count = %Zd", __func__, count);
-
dev = file->private_data;
retval = mutex_lock_interruptible(&dev->mtx);
-@@ -664,7 +634,6 @@ static ssize_t adu_write(struct file *fi
+@@ -665,7 +635,6 @@ static ssize_t adu_write(struct file *fi
exit:
mutex_unlock(&dev->mtx);
exit_nolock:
-- dbg(2," %s : leave, return value %d", __func__, retval);
+- dbg(2, " %s : leave, return value %d", __func__, retval);
return retval;
exit_onqueue:
-@@ -710,8 +679,6 @@ static int adu_probe(struct usb_interfac
+@@ -711,8 +680,6 @@ static int adu_probe(struct usb_interfac
int out_end_size;
int i;
-- dbg(2," %s : enter", __func__);
+- dbg(2, " %s : enter", __func__);
-
if (udev == NULL) {
dev_err(&interface->dev, "udev is NULL.\n");
goto exit;
-@@ -832,8 +799,6 @@ static int adu_probe(struct usb_interfac
+@@ -833,8 +800,6 @@ static int adu_probe(struct usb_interfac
udev->descriptor.idProduct, dev->serial_number,
(dev->minor - ADU_MINOR_BASE));
exit:
-- dbg(2," %s : leave, return value %p (dev)", __func__, dev);
+- dbg(2, " %s : leave, return value %p (dev)", __func__, dev);
-
return retval;
error:
-@@ -851,8 +816,6 @@ static void adu_disconnect(struct usb_in
+@@ -852,8 +817,6 @@ static void adu_disconnect(struct usb_in
struct adu_device *dev;
int minor;
-- dbg(2," %s : enter", __func__);
+- dbg(2, " %s : enter", __func__);
-
dev = usb_get_intfdata(interface);
mutex_lock(&dev->mtx); /* not interruptible */
-@@ -873,8 +836,6 @@ static void adu_disconnect(struct usb_in
+@@ -874,8 +837,6 @@ static void adu_disconnect(struct usb_in
dev_info(&interface->dev, "ADU device adutux%d now disconnected\n",
(minor - ADU_MINOR_BASE));
-
-- dbg(2," %s : leave", __func__);
+- dbg(2, " %s : leave", __func__);
}
/* usb specific object needed to register this driver with the usb subsystem */
generated by cgit 1.2.3-korg (git 2.43.0) at 2026-03-01 19:03:29 +0000