Skip to content

L
linux
Commit ff89514f authored by Bill Pemberton's avatar Bill Pemberton Committed by Greg Kroah-Hartman
Browse files
Options

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

Signed-off-by: default avatarBill Pemberton <wfp5p@virginia.edu>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent c4d30ee8
Show whitespace changes
Inline Side-by-side
Showing with 25 additions and 45 deletions
drivers/staging/comedi/drivers/addi-data/APCI1710_Ssi.c
View file @ ff89514f
...@@ -477,9 +477,8 @@ int i_APCI1710_InsnReadSSIValue(struct comedi_device *dev, struct comedi_subdevi ...@@ -477,9 +477,8 @@ int i_APCI1710_InsnReadSSIValue(struct comedi_device *dev, struct comedi_subdevi
s_BoardInfos. s_BoardInfos.
ui_Address + ui_Address +
(64 * b_ModulNbr)); (64 * b_ModulNbr));
} } while ((dw_StatusReg & 0x1)
while ((dw_StatusReg & 0x1) != != 0);
0);
/******************************/ /******************************/
/* Read the SSI counter value */ /* Read the SSI counter value */
...@@ -608,8 +607,7 @@ int i_APCI1710_InsnReadSSIValue(struct comedi_device *dev, struct comedi_subdevi ...@@ -608,8 +607,7 @@ int i_APCI1710_InsnReadSSIValue(struct comedi_device *dev, struct comedi_subdevi
s_BoardInfos. s_BoardInfos.
ui_Address + ui_Address +
(64 * b_ModulNbr)); (64 * b_ModulNbr));
} } while ((dw_StatusReg & 0x1) != 0);
while ((dw_StatusReg & 0x1) != 0);
for (b_SSICpt = 0; b_SSICpt < 3; for (b_SSICpt = 0; b_SSICpt < 3;
b_SSICpt++) { b_SSICpt++) {
......
drivers/staging/comedi/drivers/addi-data/addi_amcc_S5920.c
View file @ ff89514f
...@@ -88,8 +88,7 @@ int i_AddiHeaderRW_ReadEeprom(int i_NbOfWordsToRead, ...@@ -88,8 +88,7 @@ int i_AddiHeaderRW_ReadEeprom(int i_NbOfWordsToRead,
inl(dw_PCIBoardEepromAddress + inl(dw_PCIBoardEepromAddress +
AMCC_OP_REG_MCSR); AMCC_OP_REG_MCSR);
dw_eeprom_busy = dw_eeprom_busy & EEPROM_BUSY; 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++) { for (i_Counter = 0; i_Counter < 2; i_Counter++) {
b_SelectedAddressLow = (w_EepromStartAddress + i_Counter) % 256; /* Read the low 8 bit part */ b_SelectedAddressLow = (w_EepromStartAddress + i_Counter) % 256; /* Read the low 8 bit part */
...@@ -106,8 +105,7 @@ int i_AddiHeaderRW_ReadEeprom(int i_NbOfWordsToRead, ...@@ -106,8 +105,7 @@ int i_AddiHeaderRW_ReadEeprom(int i_NbOfWordsToRead,
inl(dw_PCIBoardEepromAddress + inl(dw_PCIBoardEepromAddress +
AMCC_OP_REG_MCSR); AMCC_OP_REG_MCSR);
dw_eeprom_busy = dw_eeprom_busy & EEPROM_BUSY; dw_eeprom_busy = dw_eeprom_busy & EEPROM_BUSY;
} } while (dw_eeprom_busy == EEPROM_BUSY);
while (dw_eeprom_busy == EEPROM_BUSY);
/* Load the low address */ /* Load the low address */
outb(b_SelectedAddressLow, outb(b_SelectedAddressLow,
...@@ -120,8 +118,7 @@ int i_AddiHeaderRW_ReadEeprom(int i_NbOfWordsToRead, ...@@ -120,8 +118,7 @@ int i_AddiHeaderRW_ReadEeprom(int i_NbOfWordsToRead,
inl(dw_PCIBoardEepromAddress + inl(dw_PCIBoardEepromAddress +
AMCC_OP_REG_MCSR); AMCC_OP_REG_MCSR);
dw_eeprom_busy = dw_eeprom_busy & EEPROM_BUSY; 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 */ /* Select the load high address mode */
outb(NVCMD_LOAD_HIGH, outb(NVCMD_LOAD_HIGH,
...@@ -134,8 +131,7 @@ int i_AddiHeaderRW_ReadEeprom(int i_NbOfWordsToRead, ...@@ -134,8 +131,7 @@ int i_AddiHeaderRW_ReadEeprom(int i_NbOfWordsToRead,
inl(dw_PCIBoardEepromAddress + inl(dw_PCIBoardEepromAddress +
AMCC_OP_REG_MCSR); AMCC_OP_REG_MCSR);
dw_eeprom_busy = dw_eeprom_busy & EEPROM_BUSY; dw_eeprom_busy = dw_eeprom_busy & EEPROM_BUSY;
} } while (dw_eeprom_busy == EEPROM_BUSY);
while (dw_eeprom_busy == EEPROM_BUSY);
/* Load the high address */ /* Load the high address */
outb(b_SelectedAddressHigh, outb(b_SelectedAddressHigh,
...@@ -148,8 +144,7 @@ int i_AddiHeaderRW_ReadEeprom(int i_NbOfWordsToRead, ...@@ -148,8 +144,7 @@ int i_AddiHeaderRW_ReadEeprom(int i_NbOfWordsToRead,
inl(dw_PCIBoardEepromAddress + inl(dw_PCIBoardEepromAddress +
AMCC_OP_REG_MCSR); AMCC_OP_REG_MCSR);
dw_eeprom_busy = dw_eeprom_busy & EEPROM_BUSY; dw_eeprom_busy = dw_eeprom_busy & EEPROM_BUSY;
} } while (dw_eeprom_busy == EEPROM_BUSY);
while (dw_eeprom_busy == EEPROM_BUSY);
/* Select the READ mode */ /* Select the READ mode */
outb(NVCMD_BEGIN_READ, outb(NVCMD_BEGIN_READ,
...@@ -162,8 +157,7 @@ int i_AddiHeaderRW_ReadEeprom(int i_NbOfWordsToRead, ...@@ -162,8 +157,7 @@ int i_AddiHeaderRW_ReadEeprom(int i_NbOfWordsToRead,
inl(dw_PCIBoardEepromAddress + inl(dw_PCIBoardEepromAddress +
AMCC_OP_REG_MCSR); AMCC_OP_REG_MCSR);
dw_eeprom_busy = dw_eeprom_busy & EEPROM_BUSY; 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 */ /* Read data into the EEPROM */
*pb_ReadByte = *pb_ReadByte =
...@@ -176,8 +170,7 @@ int i_AddiHeaderRW_ReadEeprom(int i_NbOfWordsToRead, ...@@ -176,8 +170,7 @@ int i_AddiHeaderRW_ReadEeprom(int i_NbOfWordsToRead,
inl(dw_PCIBoardEepromAddress + inl(dw_PCIBoardEepromAddress +
AMCC_OP_REG_MCSR); AMCC_OP_REG_MCSR);
dw_eeprom_busy = dw_eeprom_busy & EEPROM_BUSY; 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 */ /* Select the upper address part */
if (i_Counter == 0) { if (i_Counter == 0) {
......
drivers/staging/comedi/drivers/addi-data/addi_eeprom.c
View file @ ff89514f
...@@ -411,8 +411,7 @@ void v_EepromWaitBusy(unsigned short w_PCIBoardEepromAddress) ...@@ -411,8 +411,7 @@ void v_EepromWaitBusy(unsigned short w_PCIBoardEepromAddress)
b_EepromBusy = inb(w_PCIBoardEepromAddress + 0x3F); b_EepromBusy = inb(w_PCIBoardEepromAddress + 0x3F);
b_EepromBusy = b_EepromBusy & 0x80; b_EepromBusy = b_EepromBusy & 0x80;
} } while (b_EepromBusy == 0x80);
while (b_EepromBusy == 0x80);
} }
......
drivers/staging/comedi/drivers/addi-data/hwdrv_apci3120.c
View file @ ff89514f
...@@ -368,8 +368,7 @@ int i_APCI3120_InsnReadAnalogInput(struct comedi_device *dev, struct comedi_subd ...@@ -368,8 +368,7 @@ int i_APCI3120_InsnReadAnalogInput(struct comedi_device *dev, struct comedi_subd
us_TmpValue = us_TmpValue =
inw(devpriv->iobase + inw(devpriv->iobase +
APCI3120_RD_STATUS); APCI3120_RD_STATUS);
} } while ((us_TmpValue & APCI3120_EOS) !=
while ((us_TmpValue & APCI3120_EOS) !=
APCI3120_EOS); APCI3120_EOS);
for (i = 0; i < devpriv->ui_AiNbrofChannels; for (i = 0; i < devpriv->ui_AiNbrofChannels;
......
drivers/staging/comedi/drivers/addi-data/hwdrv_apci3200.c
View file @ ff89514f
...@@ -132,8 +132,7 @@ int i_AddiHeaderRW_ReadEeprom(int i_NbOfWordsToRead, ...@@ -132,8 +132,7 @@ int i_AddiHeaderRW_ReadEeprom(int i_NbOfWordsToRead,
inl(dw_PCIBoardEepromAddress + inl(dw_PCIBoardEepromAddress +
AMCC_OP_REG_MCSR); AMCC_OP_REG_MCSR);
dw_eeprom_busy = dw_eeprom_busy & EEPROM_BUSY; 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++) { for (i_Counter = 0; i_Counter < 2; i_Counter++) {
b_SelectedAddressLow = (w_EepromStartAddress + i_Counter) % 256; /* Read the low 8 bit part */ b_SelectedAddressLow = (w_EepromStartAddress + i_Counter) % 256; /* Read the low 8 bit part */
...@@ -150,8 +149,7 @@ int i_AddiHeaderRW_ReadEeprom(int i_NbOfWordsToRead, ...@@ -150,8 +149,7 @@ int i_AddiHeaderRW_ReadEeprom(int i_NbOfWordsToRead,
inl(dw_PCIBoardEepromAddress + inl(dw_PCIBoardEepromAddress +
AMCC_OP_REG_MCSR); AMCC_OP_REG_MCSR);
dw_eeprom_busy = dw_eeprom_busy & EEPROM_BUSY; dw_eeprom_busy = dw_eeprom_busy & EEPROM_BUSY;
} } while (dw_eeprom_busy == EEPROM_BUSY);
while (dw_eeprom_busy == EEPROM_BUSY);
/* Load the low address */ /* Load the low address */
outb(b_SelectedAddressLow, outb(b_SelectedAddressLow,
...@@ -164,8 +162,7 @@ int i_AddiHeaderRW_ReadEeprom(int i_NbOfWordsToRead, ...@@ -164,8 +162,7 @@ int i_AddiHeaderRW_ReadEeprom(int i_NbOfWordsToRead,
inl(dw_PCIBoardEepromAddress + inl(dw_PCIBoardEepromAddress +
AMCC_OP_REG_MCSR); AMCC_OP_REG_MCSR);
dw_eeprom_busy = dw_eeprom_busy & EEPROM_BUSY; 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 */ /* Select the load high address mode */
outb(NVCMD_LOAD_HIGH, outb(NVCMD_LOAD_HIGH,
...@@ -178,8 +175,7 @@ int i_AddiHeaderRW_ReadEeprom(int i_NbOfWordsToRead, ...@@ -178,8 +175,7 @@ int i_AddiHeaderRW_ReadEeprom(int i_NbOfWordsToRead,
inl(dw_PCIBoardEepromAddress + inl(dw_PCIBoardEepromAddress +
AMCC_OP_REG_MCSR); AMCC_OP_REG_MCSR);
dw_eeprom_busy = dw_eeprom_busy & EEPROM_BUSY; dw_eeprom_busy = dw_eeprom_busy & EEPROM_BUSY;
} } while (dw_eeprom_busy == EEPROM_BUSY);
while (dw_eeprom_busy == EEPROM_BUSY);
/* Load the high address */ /* Load the high address */
outb(b_SelectedAddressHigh, outb(b_SelectedAddressHigh,
...@@ -192,8 +188,7 @@ int i_AddiHeaderRW_ReadEeprom(int i_NbOfWordsToRead, ...@@ -192,8 +188,7 @@ int i_AddiHeaderRW_ReadEeprom(int i_NbOfWordsToRead,
inl(dw_PCIBoardEepromAddress + inl(dw_PCIBoardEepromAddress +
AMCC_OP_REG_MCSR); AMCC_OP_REG_MCSR);
dw_eeprom_busy = dw_eeprom_busy & EEPROM_BUSY; dw_eeprom_busy = dw_eeprom_busy & EEPROM_BUSY;
} } while (dw_eeprom_busy == EEPROM_BUSY);
while (dw_eeprom_busy == EEPROM_BUSY);
/* Select the READ mode */ /* Select the READ mode */
outb(NVCMD_BEGIN_READ, outb(NVCMD_BEGIN_READ,
...@@ -206,8 +201,7 @@ int i_AddiHeaderRW_ReadEeprom(int i_NbOfWordsToRead, ...@@ -206,8 +201,7 @@ int i_AddiHeaderRW_ReadEeprom(int i_NbOfWordsToRead,
inl(dw_PCIBoardEepromAddress + inl(dw_PCIBoardEepromAddress +
AMCC_OP_REG_MCSR); AMCC_OP_REG_MCSR);
dw_eeprom_busy = dw_eeprom_busy & EEPROM_BUSY; 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 */ /* Read data into the EEPROM */
*pb_ReadByte = *pb_ReadByte =
...@@ -220,15 +214,14 @@ int i_AddiHeaderRW_ReadEeprom(int i_NbOfWordsToRead, ...@@ -220,15 +214,14 @@ int i_AddiHeaderRW_ReadEeprom(int i_NbOfWordsToRead,
inl(dw_PCIBoardEepromAddress + inl(dw_PCIBoardEepromAddress +
AMCC_OP_REG_MCSR); AMCC_OP_REG_MCSR);
dw_eeprom_busy = dw_eeprom_busy & EEPROM_BUSY; 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 */ /* Select the upper address part */
if (i_Counter == 0) { if (i_Counter == 0)
b_ReadLowByte = pb_ReadByte[0]; b_ReadLowByte = pb_ReadByte[0];
} else { else
b_ReadHighByte = pb_ReadByte[0]; b_ReadHighByte = pb_ReadByte[0];
}
/* Sleep */ /* Sleep */
for (i = 0; i < 10000; i++) ; for (i = 0; i < 10000; i++) ;
......
drivers/staging/comedi/drivers/addi-data/hwdrv_apci3xxx.c
View file @ ff89514f
...@@ -535,8 +535,7 @@ int i_APCI3XXX_InsnReadAnalogInput(struct comedi_device *dev, ...@@ -535,8 +535,7 @@ int i_APCI3XXX_InsnReadAnalogInput(struct comedi_device *dev,
dw_Temp = dw_Temp =
dw_Temp dw_Temp
& 1; & 1;
} } while (dw_Temp != 1);
while (dw_Temp != 1);
/*************************/ /*************************/
/* Read the analog value */ /* Read the analog value */
...@@ -729,8 +728,7 @@ int i_APCI3XXX_InsnWriteAnalogOutput(struct comedi_device *dev, ...@@ -729,8 +728,7 @@ int i_APCI3XXX_InsnWriteAnalogOutput(struct comedi_device *dev,
dw_Status = dw_Status =
readl((void *)(devpriv-> readl((void *)(devpriv->
dw_AiBase + 96)); dw_AiBase + 96));
} } while ((dw_Status & 0x100) != 0x100);
while ((dw_Status & 0x100) != 0x100);
} else { } else {
/***************************/ /***************************/
/* Channel not initialised */ /* Channel not initialised */
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7