OSDN Git Service

staging: wilc1000: Remove unnecessary brackets
authorTamara Diaconita <diaconitatamara@gmail.com>
Tue, 14 Mar 2017 12:10:38 +0000 (14:10 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 16 Mar 2017 02:47:41 +0000 (11:47 +0900)
Remove unnecessary brackets and correspondingly unindent code.

Signed-off-by: Tamara Diaconita <diaconita.tamara@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/staging/wilc1000/wilc_spi.c

index 1bc7867..5ef8441 100644 (file)
@@ -946,31 +946,28 @@ static int wilc_spi_read_int(struct wilc *wilc, u32 *int_status)
                }
                tmp = (byte_cnt >> 2) & IRQ_DMA_WD_CNT_MASK;
 
-               {
-                       j = 0;
-                       do {
-                               happened = 0;
+               j = 0;
+               do {
+                       happened = 0;
 
-                               wilc_spi_read_reg(wilc, 0x1a90, &irq_flags);
-                               tmp |= ((irq_flags >> 27) << IRG_FLAGS_OFFSET);
+                       wilc_spi_read_reg(wilc, 0x1a90, &irq_flags);
+                       tmp |= ((irq_flags >> 27) << IRG_FLAGS_OFFSET);
 
-                               if (g_spi.nint > 5) {
-                                       wilc_spi_read_reg(wilc, 0x1a94,
-                                                         &irq_flags);
-                                       tmp |= (((irq_flags >> 0) & 0x7) << (IRG_FLAGS_OFFSET + 5));
-                               }
+                       if (g_spi.nint > 5) {
+                               wilc_spi_read_reg(wilc, 0x1a94,
+                                                 &irq_flags);
+                               tmp |= (((irq_flags >> 0) & 0x7) << (IRG_FLAGS_OFFSET + 5));
+                       }
 
-                               {
-                                       unknown_mask = ~((1ul << g_spi.nint) - 1);
+                       unknown_mask = ~((1ul << g_spi.nint) - 1);
 
-                                       if ((tmp >> IRG_FLAGS_OFFSET) & unknown_mask) {
-                                               dev_err(&spi->dev, "Unexpected interrupt (2): j=%d, tmp=%x, mask=%x\n", j, tmp, unknown_mask);
-                                               happened = 1;
-                                       }
-                               }
-                               j++;
-                       } while (happened);
-               }
+                       if ((tmp >> IRG_FLAGS_OFFSET) & unknown_mask) {
+                               dev_err(&spi->dev, "Unexpected interrupt (2): j=%d, tmp=%x, mask=%x\n", j, tmp, unknown_mask);
+                                       happened = 1;
+                       }
+
+                       j++;
+               } while (happened);
 
                *int_status = tmp;
        }