Removed braces from single line if, else, for statements.
Replaced space indents with tabs. Fixed whitespace errors around operators.
Signed-off-by: Kevin Pietsch
---
drivers/staging/ft1000/ft1000-pcmcia/ft1000_hw.c | 225 +--
1 file changed, 90 insertions(+), 135 deletions(-)
diff --git a/drivers/staging/ft1000/ft1000-pcmcia/ft1000_hw.c
b/drivers/staging/ft1000/ft1000-pcmcia/ft1000_hw.c
index 44575c7..444ea53 100644
--- a/drivers/staging/ft1000/ft1000-pcmcia/ft1000_hw.c
+++ b/drivers/staging/ft1000/ft1000-pcmcia/ft1000_hw.c
@@ -176,11 +176,10 @@ u16 ft1000_read_dpram_mag_16(struct net_device *dev, int
offset, int Index)
spin_lock_irqsave(&info->dpram_lock, flags);
ft1000_write_reg(dev, FT1000_REG_DPRAM_ADDR, offset);
/* check if we want to read upper or lower 32-bit word */
- if (Index) {
+ if (Index)
data = ft1000_read_reg(dev, FT1000_REG_MAG_DPDATAL);
- } else {
+ else
data = ft1000_read_reg(dev, FT1000_REG_MAG_DPDATAH);
- }
spin_unlock_irqrestore(&info->dpram_lock, flags);
return data;
@@ -208,11 +207,10 @@ static inline void ft1000_write_dpram_mag_16(struct
net_device *dev,
/* Provide mutual exclusive access while reading ASIC registers. */
spin_lock_irqsave(&info->dpram_lock, flags);
ft1000_write_reg(dev, FT1000_REG_DPRAM_ADDR, offset);
- if (Index) {
+ if (Index)
ft1000_write_reg(dev, FT1000_REG_MAG_DPDATAL, value);
- } else {
+ else
ft1000_write_reg(dev, FT1000_REG_MAG_DPDATAH, value);
- }
spin_unlock_irqrestore(&info->dpram_lock, flags);
}
@@ -337,18 +335,16 @@ static void ft1000_reset_asic(struct net_device *dev)
* Let's use the register provided by the Magnemite ASIC to reset the
* ASIC and DSP.
*/
- if (info->AsicID == MAGNEMITE_ID) {
+ if (info->AsicID == MAGNEMITE_ID)
ft1000_write_reg(dev, FT1000_REG_RESET,
(DSP_RESET_BIT | ASIC_RESET_BIT));
- }
mdelay(1);
- if (info->AsicID == ELECTRABUZZ_ID) {
+ if (info->AsicID == ELECTRABUZZ_ID)
/* set watermark to -1 in order to not generate an interrupt */
ft1000_write_reg(dev, FT1000_REG_WATERMARK, 0x);
- } else {
+ else
/* set watermark to -1 in order to not generate an interrupt */
ft1000_write_reg(dev, FT1000_REG_MAG_WATERMARK, 0x);
- }
/* clear interrupts */
tempword = ft1000_read_reg(dev, FT1000_REG_SUP_ISR);
DEBUG(1, "ft1000_hw: interrupt status register = 0x%x\n", tempword);
@@ -412,18 +408,16 @@ static int ft1000_reset_card(struct net_device *dev)
if (info->AsicID == ELECTRABUZZ_ID) {
ft1000_write_reg(dev, FT1000_REG_DPRAM_ADDR,
FT1000_DPRAM_RX_BASE);
- for (i = 0; i < MAX_DSP_SESS_REC; i++) {
+ for (i = 0; i < MAX_DSP_SESS_REC; i++)
info->DSPSess.Rec[i] =
ft1000_read_reg(dev,
FT1000_REG_DPRAM_DATA);
- }
} else {
ft1000_write_reg(dev, FT1000_REG_DPRAM_ADDR,
FT1000_DPRAM_MAG_RX_BASE);
- for (i = 0; i < MAX_DSP_SESS_REC / 2; i++) {
+ for (i = 0; i < MAX_DSP_SESS_REC / 2; i++)
info->DSPSess.MagRec[i] =
inl(dev->base_addr +
FT1000_REG_MAG_DPDATA);
- }
}
spin_unlock_irqrestore(&info->dpram_lock, flags);
}
@@ -457,9 +451,8 @@ static int ft1000_reset_card(struct net_device *dev)
tempword =
ft1000_read_dpram_mag_16(dev,
FT1000_MAG_DPRAM_FEFE,
FT1000_MAG_DPRAM_FEFE_INDX);
- if (tempword == 0xfefe) {
+ if (tempword == 0xfefe)
break;
- }
mdelay(20);
}
@@ -478,9 +471,8 @@ static int ft1000_reset_card(struct net_device *dev)
if (card_download(dev, fw_entry->data, fw_entry->size)) {
DEBUG(1, "card download unsuccessful\n");
return false;
- } else {
+ } else
DEBUG(1, "card download successful\n");
- }
mdelay(10);
@@ -581,24 +573,21 @@ static void ft1000_hbchk(u_long data)
if (info->CardReady == 1) {
/* Pe
