aboutsummaryrefslogtreecommitdiffstats
path: root/usb-adutux-remove-custom-debug-macro.patch
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 /usb-adutux-remove-custom-debug-macro.patch
parent08d2feaec62a45d40dc318b94ec3ea58599fbb0a (diff)
downloadpatches-fba2e3a02ab610753189177babd75c68f070569e.tar.gz
refresh
Diffstat (limited to 'usb-adutux-remove-custom-debug-macro.patch')
-rw-r--r--usb-adutux-remove-custom-debug-macro.patch50
1 files changed, 25 insertions, 25 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)
generated by cgit 1.2.3-korg (git 2.43.0) at 2026-03-01 17:37:56 +0000