Staging: comedi: move while to same line as } in do loops

Signed-off-by: Bill Pemberton <wfp5p@virginia.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

diff --git a/drivers/staging/comedi/drivers/addi-data/APCI1710_Ssi.c b/drivers/staging/comedi/drivers/addi-data/APCI1710_Ssi.c
index a94b980938261a5f8d8d5317df7adcde49722e01..a445dab50eac9012d97a2a2d7bef6cfe40b43c56 100644 (file)
--- a/drivers/staging/comedi/drivers/addi-data/APCI1710_Ssi.c
+++ b/drivers/staging/comedi/drivers/addi-data/APCI1710_Ssi.c
@@ -477,9 +477,8 @@ int i_APCI1710_InsnReadSSIValue(struct comedi_device *dev, struct comedi_subdevi
                                                                s_BoardInfos.
                                                                ui_Address +
                                                                (64 * b_ModulNbr));
-                                               }
-                                               while ((dw_StatusReg & 0x1) !=
-                                                       0);
+                                               } while ((dw_StatusReg & 0x1)
+                                                        != 0);
 
                    /******************************/
                                                /* Read the SSI counter value */
@@ -608,8 +607,7 @@ int i_APCI1710_InsnReadSSIValue(struct comedi_device *dev, struct comedi_subdevi
                                                        s_BoardInfos.
                                                        ui_Address +
                                                        (64 * b_ModulNbr));
-                                       }
-                                       while ((dw_StatusReg & 0x1) != 0);
+                                       } while ((dw_StatusReg & 0x1) != 0);
 
                                        for (b_SSICpt = 0; b_SSICpt < 3;
                                                b_SSICpt++) {

diff --git a/drivers/staging/comedi/drivers/addi-data/addi_amcc_S5920.c b/drivers/staging/comedi/drivers/addi-data/addi_amcc_S5920.c
index 6ada45a46d6750c20baa5d7dee84cfffc871118d..556ed46d78a7a3d32e65687e3a685986f06f1723 100644 (file)
--- a/drivers/staging/comedi/drivers/addi-data/addi_amcc_S5920.c
+++ b/drivers/staging/comedi/drivers/addi-data/addi_amcc_S5920.c
@@ -88,8 +88,7 @@ int i_AddiHeaderRW_ReadEeprom(int i_NbOfWordsToRead,
                                inl(dw_PCIBoardEepromAddress +
                                AMCC_OP_REG_MCSR);
                        dw_eeprom_busy = dw_eeprom_busy & EEPROM_BUSY;
-               }
-               while (dw_eeprom_busy == EEPROM_BUSY);
+               } while (dw_eeprom_busy == EEPROM_BUSY);
 
                for (i_Counter = 0; i_Counter < 2; i_Counter++) {
                        b_SelectedAddressLow = (w_EepromStartAddress + i_Counter) % 256;        /* Read the low 8 bit part */
@@ -106,8 +105,7 @@ int i_AddiHeaderRW_ReadEeprom(int i_NbOfWordsToRead,
                                        inl(dw_PCIBoardEepromAddress +
                                        AMCC_OP_REG_MCSR);
                                dw_eeprom_busy = dw_eeprom_busy & EEPROM_BUSY;
-                       }
-                       while (dw_eeprom_busy == EEPROM_BUSY);
+                       } while (dw_eeprom_busy == EEPROM_BUSY);
 
                        /* Load the low address */
                        outb(b_SelectedAddressLow,
@@ -120,8 +118,7 @@ int i_AddiHeaderRW_ReadEeprom(int i_NbOfWordsToRead,
                                        inl(dw_PCIBoardEepromAddress +
                                        AMCC_OP_REG_MCSR);
                                dw_eeprom_busy = dw_eeprom_busy & EEPROM_BUSY;
-                       }
-                       while (dw_eeprom_busy == EEPROM_BUSY);
+                       } while (dw_eeprom_busy == EEPROM_BUSY);
 
                        /* Select the load high address mode */
                        outb(NVCMD_LOAD_HIGH,
@@ -134,8 +131,7 @@ int i_AddiHeaderRW_ReadEeprom(int i_NbOfWordsToRead,
                                        inl(dw_PCIBoardEepromAddress +
                                        AMCC_OP_REG_MCSR);
                                dw_eeprom_busy = dw_eeprom_busy & EEPROM_BUSY;
-                       }
-                       while (dw_eeprom_busy == EEPROM_BUSY);
+                       } while (dw_eeprom_busy == EEPROM_BUSY);
 
                        /* Load the high address */
                        outb(b_SelectedAddressHigh,
@@ -148,8 +144,7 @@ int i_AddiHeaderRW_ReadEeprom(int i_NbOfWordsToRead,
                                        inl(dw_PCIBoardEepromAddress +
                                        AMCC_OP_REG_MCSR);
                                dw_eeprom_busy = dw_eeprom_busy & EEPROM_BUSY;
-                       }
-                       while (dw_eeprom_busy == EEPROM_BUSY);
+                       } while (dw_eeprom_busy == EEPROM_BUSY);
 
                        /* Select the READ mode */
                        outb(NVCMD_BEGIN_READ,
@@ -162,8 +157,7 @@ int i_AddiHeaderRW_ReadEeprom(int i_NbOfWordsToRead,
                                        inl(dw_PCIBoardEepromAddress +
                                        AMCC_OP_REG_MCSR);
                                dw_eeprom_busy = dw_eeprom_busy & EEPROM_BUSY;
-                       }
-                       while (dw_eeprom_busy == EEPROM_BUSY);
+                       } while (dw_eeprom_busy == EEPROM_BUSY);
 
                        /* Read data into the EEPROM */
                        *pb_ReadByte =
@@ -176,8 +170,7 @@ int i_AddiHeaderRW_ReadEeprom(int i_NbOfWordsToRead,
                                        inl(dw_PCIBoardEepromAddress +
                                        AMCC_OP_REG_MCSR);
                                dw_eeprom_busy = dw_eeprom_busy & EEPROM_BUSY;
-                       }
-                       while (dw_eeprom_busy == EEPROM_BUSY);
+                       } while (dw_eeprom_busy == EEPROM_BUSY);
 
                        /* Select the upper address part */
                        if (i_Counter == 0) {

diff --git a/drivers/staging/comedi/drivers/addi-data/addi_eeprom.c b/drivers/staging/comedi/drivers/addi-data/addi_eeprom.c
index 208ade70ad0c8762e63df5d3b4675fc91e248ba6..69b427390e537c2a467d618034d782f339d2f683 100644 (file)
--- a/drivers/staging/comedi/drivers/addi-data/addi_eeprom.c
+++ b/drivers/staging/comedi/drivers/addi-data/addi_eeprom.c
@@ -411,8 +411,7 @@ void v_EepromWaitBusy(unsigned short w_PCIBoardEepromAddress)
                b_EepromBusy = inb(w_PCIBoardEepromAddress + 0x3F);
                b_EepromBusy = b_EepromBusy & 0x80;
 
-       }
-       while (b_EepromBusy == 0x80);
+       } while (b_EepromBusy == 0x80);
 
 }
 

diff --git a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci3120.c b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci3120.c
index 26aaeaf2568360f718360fcabc70835bf7a68d52..69d5c3a92f084679bec3ddcb5bb8e75bdbc0b096 100644 (file)
--- a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci3120.c
+++ b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci3120.c
@@ -368,9 +368,8 @@ int i_APCI3120_InsnReadAnalogInput(struct comedi_device *dev, struct comedi_subd
                                        us_TmpValue =
                                                inw(devpriv->iobase +
                                                APCI3120_RD_STATUS);
-                               }
-                               while ((us_TmpValue & APCI3120_EOS) !=
-                                       APCI3120_EOS);
+                               } while ((us_TmpValue & APCI3120_EOS) !=
+                                        APCI3120_EOS);
 
                                for (i = 0; i < devpriv->ui_AiNbrofChannels;
                                        i++) {

diff --git a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci3200.c b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci3200.c
index 7dda066534028103800167c003440320e9d2f274..89d4e21b99540c5c8b5d8cbdc6bb9b6021fb7e57 100644 (file)
--- a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci3200.c
+++ b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci3200.c
@@ -132,8 +132,7 @@ int i_AddiHeaderRW_ReadEeprom(int i_NbOfWordsToRead,
                                inl(dw_PCIBoardEepromAddress +
                                AMCC_OP_REG_MCSR);
                        dw_eeprom_busy = dw_eeprom_busy & EEPROM_BUSY;
-               }
-               while (dw_eeprom_busy == EEPROM_BUSY);
+               } while (dw_eeprom_busy == EEPROM_BUSY);
 
                for (i_Counter = 0; i_Counter < 2; i_Counter++) {
                        b_SelectedAddressLow = (w_EepromStartAddress + i_Counter) % 256;        /* Read the low 8 bit part */
@@ -150,8 +149,7 @@ int i_AddiHeaderRW_ReadEeprom(int i_NbOfWordsToRead,
                                        inl(dw_PCIBoardEepromAddress +
                                        AMCC_OP_REG_MCSR);
                                dw_eeprom_busy = dw_eeprom_busy & EEPROM_BUSY;
-                       }
-                       while (dw_eeprom_busy == EEPROM_BUSY);
+                       } while (dw_eeprom_busy == EEPROM_BUSY);
 
                        /* Load the low address */
                        outb(b_SelectedAddressLow,
@@ -164,8 +162,7 @@ int i_AddiHeaderRW_ReadEeprom(int i_NbOfWordsToRead,
                                        inl(dw_PCIBoardEepromAddress +
                                        AMCC_OP_REG_MCSR);
                                dw_eeprom_busy = dw_eeprom_busy & EEPROM_BUSY;
-                       }
-                       while (dw_eeprom_busy == EEPROM_BUSY);
+                       } while (dw_eeprom_busy == EEPROM_BUSY);
 
                        /* Select the load high address mode */
                        outb(NVCMD_LOAD_HIGH,
@@ -178,8 +175,7 @@ int i_AddiHeaderRW_ReadEeprom(int i_NbOfWordsToRead,
                                        inl(dw_PCIBoardEepromAddress +
                                        AMCC_OP_REG_MCSR);
                                dw_eeprom_busy = dw_eeprom_busy & EEPROM_BUSY;
-                       }
-                       while (dw_eeprom_busy == EEPROM_BUSY);
+                       } while (dw_eeprom_busy == EEPROM_BUSY);
 
                        /* Load the high address */
                        outb(b_SelectedAddressHigh,
@@ -192,8 +188,7 @@ int i_AddiHeaderRW_ReadEeprom(int i_NbOfWordsToRead,
                                        inl(dw_PCIBoardEepromAddress +
                                        AMCC_OP_REG_MCSR);
                                dw_eeprom_busy = dw_eeprom_busy & EEPROM_BUSY;
-                       }
-                       while (dw_eeprom_busy == EEPROM_BUSY);
+                       } while (dw_eeprom_busy == EEPROM_BUSY);
 
                        /* Select the READ mode */
                        outb(NVCMD_BEGIN_READ,
@@ -206,8 +201,7 @@ int i_AddiHeaderRW_ReadEeprom(int i_NbOfWordsToRead,
                                        inl(dw_PCIBoardEepromAddress +
                                        AMCC_OP_REG_MCSR);
                                dw_eeprom_busy = dw_eeprom_busy & EEPROM_BUSY;
-                       }
-                       while (dw_eeprom_busy == EEPROM_BUSY);
+                       } while (dw_eeprom_busy == EEPROM_BUSY);
 
                        /* Read data into the EEPROM */
                        *pb_ReadByte =
@@ -220,15 +214,14 @@ int i_AddiHeaderRW_ReadEeprom(int i_NbOfWordsToRead,
                                        inl(dw_PCIBoardEepromAddress +
                                        AMCC_OP_REG_MCSR);
                                dw_eeprom_busy = dw_eeprom_busy & EEPROM_BUSY;
-                       }
-                       while (dw_eeprom_busy == EEPROM_BUSY);
+                       } while (dw_eeprom_busy == EEPROM_BUSY);
 
                        /* Select the upper address part */
-                       if (i_Counter == 0) {
+                       if (i_Counter == 0)
                                b_ReadLowByte = pb_ReadByte[0];
-                       } else {
+                       else
                                b_ReadHighByte = pb_ReadByte[0];
-                       }
+
 
                        /* Sleep */
                        for (i = 0; i < 10000; i++) ;

diff --git a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci3xxx.c b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci3xxx.c
index 30594c8acd359a055790c7877b969eac28c81d3f..338727879827611a05ecc81ef97cbab79090af7d 100644 (file)
--- a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci3xxx.c
+++ b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci3xxx.c
@@ -535,8 +535,7 @@ int i_APCI3XXX_InsnReadAnalogInput(struct comedi_device *dev,
                                                                dw_Temp =
                                                                        dw_Temp
                                                                        & 1;
-                                                       }
-                                                       while (dw_Temp != 1);
+                                                       } while (dw_Temp != 1);
 
                          /*************************/
                                                        /* Read the analog value */
@@ -729,8 +728,7 @@ int i_APCI3XXX_InsnWriteAnalogOutput(struct comedi_device *dev,
                                        dw_Status =
                                                readl((void *)(devpriv->
                                                        dw_AiBase + 96));
-                               }
-                               while ((dw_Status & 0x100) != 0x100);
+                               } while ((dw_Status & 0x100) != 0x100);
                        } else {
                 /***************************/
                                /* Channel not initialised */