diff options
author | Ladislav Michl <ladis@linux-mips.org> | 2016-11-18 13:01:22 -0500 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2016-11-21 05:36:15 -0500 |
commit | 90744af8b04bf05d8231c1e8c822d2f44cb2d391 (patch) | |
tree | 973047367bb9e15ce967052b82fbabf75a49f703 /drivers/usb/class | |
parent | ae4d814bf1f2b0b7a37b3c30970d6974911f1377 (diff) |
cdc-acm: reindent log messages
Use only one tab to indent dev_{(v)dbg,err} parameters.
Signed-off-by: Ladislav Michl <ladis@linux-mips.org>
Acked-by: Oliver Neukum <oneukum@suse.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/usb/class')
-rw-r--r-- | drivers/usb/class/cdc-acm.c | 35 |
1 files changed, 17 insertions, 18 deletions
diff --git a/drivers/usb/class/cdc-acm.c b/drivers/usb/class/cdc-acm.c index 6895f9e2dfe4..9ae94bc7a1be 100644 --- a/drivers/usb/class/cdc-acm.c +++ b/drivers/usb/class/cdc-acm.c | |||
@@ -133,8 +133,8 @@ static int acm_ctrl_msg(struct acm *acm, int request, int value, | |||
133 | buf, len, 5000); | 133 | buf, len, 5000); |
134 | 134 | ||
135 | dev_dbg(&acm->control->dev, | 135 | dev_dbg(&acm->control->dev, |
136 | "%s - rq 0x%02x, val %#x, len %#x, result %d\n", | 136 | "%s - rq 0x%02x, val %#x, len %#x, result %d\n", |
137 | __func__, request, value, len, retval); | 137 | __func__, request, value, len, retval); |
138 | 138 | ||
139 | usb_autopm_put_interface(acm->control); | 139 | usb_autopm_put_interface(acm->control); |
140 | 140 | ||
@@ -291,13 +291,13 @@ static void acm_ctrl_irq(struct urb *urb) | |||
291 | case -ESHUTDOWN: | 291 | case -ESHUTDOWN: |
292 | /* this urb is terminated, clean up */ | 292 | /* this urb is terminated, clean up */ |
293 | dev_dbg(&acm->control->dev, | 293 | dev_dbg(&acm->control->dev, |
294 | "%s - urb shutting down with status: %d\n", | 294 | "%s - urb shutting down with status: %d\n", |
295 | __func__, status); | 295 | __func__, status); |
296 | return; | 296 | return; |
297 | default: | 297 | default: |
298 | dev_dbg(&acm->control->dev, | 298 | dev_dbg(&acm->control->dev, |
299 | "%s - nonzero urb status received: %d\n", | 299 | "%s - nonzero urb status received: %d\n", |
300 | __func__, status); | 300 | __func__, status); |
301 | goto exit; | 301 | goto exit; |
302 | } | 302 | } |
303 | 303 | ||
@@ -306,16 +306,16 @@ static void acm_ctrl_irq(struct urb *urb) | |||
306 | data = (unsigned char *)(dr + 1); | 306 | data = (unsigned char *)(dr + 1); |
307 | switch (dr->bNotificationType) { | 307 | switch (dr->bNotificationType) { |
308 | case USB_CDC_NOTIFY_NETWORK_CONNECTION: | 308 | case USB_CDC_NOTIFY_NETWORK_CONNECTION: |
309 | dev_dbg(&acm->control->dev, "%s - network connection: %d\n", | 309 | dev_dbg(&acm->control->dev, |
310 | __func__, dr->wValue); | 310 | "%s - network connection: %d\n", __func__, dr->wValue); |
311 | break; | 311 | break; |
312 | 312 | ||
313 | case USB_CDC_NOTIFY_SERIAL_STATE: | 313 | case USB_CDC_NOTIFY_SERIAL_STATE: |
314 | newctrl = get_unaligned_le16(data); | 314 | newctrl = get_unaligned_le16(data); |
315 | 315 | ||
316 | if (!acm->clocal && (acm->ctrlin & ~newctrl & ACM_CTRL_DCD)) { | 316 | if (!acm->clocal && (acm->ctrlin & ~newctrl & ACM_CTRL_DCD)) { |
317 | dev_dbg(&acm->control->dev, "%s - calling hangup\n", | 317 | dev_dbg(&acm->control->dev, |
318 | __func__); | 318 | "%s - calling hangup\n", __func__); |
319 | tty_port_tty_hangup(&acm->port, false); | 319 | tty_port_tty_hangup(&acm->port, false); |
320 | } | 320 | } |
321 | 321 | ||
@@ -357,8 +357,8 @@ static void acm_ctrl_irq(struct urb *urb) | |||
357 | exit: | 357 | exit: |
358 | retval = usb_submit_urb(urb, GFP_ATOMIC); | 358 | retval = usb_submit_urb(urb, GFP_ATOMIC); |
359 | if (retval && retval != -EPERM) | 359 | if (retval && retval != -EPERM) |
360 | dev_err(&acm->control->dev, "%s - usb_submit_urb failed: %d\n", | 360 | dev_err(&acm->control->dev, |
361 | __func__, retval); | 361 | "%s - usb_submit_urb failed: %d\n", __func__, retval); |
362 | } | 362 | } |
363 | 363 | ||
364 | static int acm_submit_read_urb(struct acm *acm, int index, gfp_t mem_flags) | 364 | static int acm_submit_read_urb(struct acm *acm, int index, gfp_t mem_flags) |
@@ -372,8 +372,8 @@ static int acm_submit_read_urb(struct acm *acm, int index, gfp_t mem_flags) | |||
372 | if (res) { | 372 | if (res) { |
373 | if (res != -EPERM) { | 373 | if (res != -EPERM) { |
374 | dev_err(&acm->data->dev, | 374 | dev_err(&acm->data->dev, |
375 | "urb %d failed submission with %d\n", | 375 | "urb %d failed submission with %d\n", |
376 | index, res); | 376 | index, res); |
377 | } | 377 | } |
378 | set_bit(index, &acm->read_urbs_free); | 378 | set_bit(index, &acm->read_urbs_free); |
379 | return res; | 379 | return res; |
@@ -416,8 +416,7 @@ static void acm_read_bulk_callback(struct urb *urb) | |||
416 | int status = urb->status; | 416 | int status = urb->status; |
417 | 417 | ||
418 | dev_vdbg(&acm->data->dev, "got urb %d, len %d, status %d\n", | 418 | dev_vdbg(&acm->data->dev, "got urb %d, len %d, status %d\n", |
419 | rb->index, urb->actual_length, | 419 | rb->index, urb->actual_length, status); |
420 | status); | ||
421 | 420 | ||
422 | if (!acm->dev) { | 421 | if (!acm->dev) { |
423 | set_bit(rb->index, &acm->read_urbs_free); | 422 | set_bit(rb->index, &acm->read_urbs_free); |
@@ -837,8 +836,8 @@ static int acm_tty_break_ctl(struct tty_struct *tty, int state) | |||
837 | 836 | ||
838 | retval = acm_send_break(acm, state ? 0xffff : 0); | 837 | retval = acm_send_break(acm, state ? 0xffff : 0); |
839 | if (retval < 0) | 838 | if (retval < 0) |
840 | dev_dbg(&acm->control->dev, "%s - send break failed\n", | 839 | dev_dbg(&acm->control->dev, |
841 | __func__); | 840 | "%s - send break failed\n", __func__); |
842 | return retval; | 841 | return retval; |
843 | } | 842 | } |
844 | 843 | ||