Skip to content

Commit

Permalink
Staging: comedi: move while to same line as } in do loops
Browse files Browse the repository at this point in the history 
Signed-off-by: Bill Pemberton <wfp5p@virginia.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  • Loading branch information
Bill Pemberton authored and Greg Kroah-Hartman committed Jun 19, 2009
1 parent c4d30ee commit ff89514
Show file tree
Hide file tree
Showing 6 changed files with 25 additions and 45 deletions.
8 changes: 3 additions & 5 deletions drivers/staging/comedi/drivers/addi-data/APCI1710_Ssi.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 */
Expand Down Expand Up @@ -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++) {
Expand Down
21 changes: 7 additions & 14 deletions drivers/staging/comedi/drivers/addi-data/addi_amcc_S5920.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 */
Expand All @@ -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,
Expand All @@ -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,
Expand All @@ -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,
Expand All @@ -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,
Expand All @@ -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 =
Expand All @@ -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) {
Expand Down
3 changes: 1 addition & 2 deletions drivers/staging/comedi/drivers/addi-data/addi_eeprom.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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);

}

Expand Down
5 changes: 2 additions & 3 deletions drivers/staging/comedi/drivers/addi-data/hwdrv_apci3120.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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++) {
Expand Down
27 changes: 10 additions & 17 deletions drivers/staging/comedi/drivers/addi-data/hwdrv_apci3200.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 */
Expand All @@ -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,
Expand All @@ -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,
Expand All @@ -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,
Expand All @@ -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,
Expand All @@ -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 =
Expand All @@ -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++) ;
Expand Down
6 changes: 2 additions & 4 deletions drivers/staging/comedi/drivers/addi-data/hwdrv_apci3xxx.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 */
Expand Down Expand Up @@ -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 */
Expand Down

0 comments on commit ff89514

Please sign in to comment.