usb: host: ehci-dbg: move trailing statements to next line

This patch fixes coding style issues reported by checkpatch concerning
to switch case statements. There are few additional changes made to fix
other coding styles issues.

These additional changes are:

 - The compound statement "({...})" on line 474 is pulled out from
   snprintf parameters.

 - On line 723 the constant "0x03" is moved to right.

Signed-off-by: Geyslan G. Bem <geyslan@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/usb/host/ehci-dbg.c b/drivers/usb/host/ehci-dbg.c
index df9f5986696f9e89e41656b71d41aaadedaffdbe..c409e4ff9d958b0a85552b4f71d84f19904461c0 100644 (file)
--- a/drivers/usb/host/ehci-dbg.c
+++ b/drivers/usb/host/ehci-dbg.c
@@ -243,10 +243,18 @@ dbg_port_buf(char *buf, unsigned len, const char *label, int port, u32 status)
 
        /* signaling state */
        switch (status & (3 << 10)) {
-       case 0 << 10: sig = "se0"; break;
-       case 1 << 10: sig = "k"; break;         /* low speed */
-       case 2 << 10: sig = "j"; break;
-       default: sig = "?"; break;
+       case 0 << 10:
+               sig = "se0";
+               break;
+       case 1 << 10: /* low speed */
+               sig = "k";
+               break;
+       case 2 << 10:
+               sig = "j";
+               break;
+       default:
+               sig = "?";
+               break;
        }
 
        return scnprintf(buf, len,
@@ -451,6 +459,8 @@ static void qh_lines(
 
        /* hc may be modifying the list as we read it ... */
        list_for_each(entry, &qh->qtd_list) {
+               char *type;
+
                td = list_entry(entry, struct ehci_qtd, qtd_list);
                scratch = hc32_to_cpup(ehci, &td->hw_token);
                mark = ' ';
@@ -464,16 +474,24 @@ static void qh_lines(
                        else if (td->hw_alt_next != list_end)
                                mark = '/';
                }
+               switch ((scratch >> 8) & 0x03) {
+               case 0:
+                       type = "out";
+                       break;
+               case 1:
+                       type = "in";
+                       break;
+               case 2:
+                       type = "setup";
+                       break;
+               default:
+                       type = "?";
+                       break;
+               }
                temp = snprintf(next, size,
                                "\n\t%p%c%s len=%d %08x urb %p"
                                " [td %08x buf[0] %08x]",
-                               td, mark, ({ char *tmp;
-                                switch ((scratch>>8)&0x03) {
-                                case 0: tmp = "out"; break;
-                                case 1: tmp = "in"; break;
-                                case 2: tmp = "setup"; break;
-                                default: tmp = "?"; break;
-                                } tmp;}),
+                               td, mark, type,
                                (scratch >> 16) & 0x7fff,
                                scratch,
                                td->urb,
@@ -702,11 +720,15 @@ static ssize_t fill_periodic_buffer(struct debug_buffer *buf)
                                                        &p.qh->qtd_list,
                                                        qtd_list) {
                                                temp++;
-                                               switch (0x03 & (hc32_to_cpu(
-                                                       ehci,
-                                                       qtd->hw_token) >> 8)) {
-                                               case 0: type = "out"; continue;
-                                               case 1: type = "in"; continue;
+                                               switch ((hc32_to_cpu(ehci,
+                                                       qtd->hw_token) >> 8)
+                                                               & 0x03) {
+                                               case 0:
+                                                       type = "out";
+                                                       continue;
+                                               case 1:
+                                                       type = "in";
+                                                       continue;
                                                }
                                        }