On Wed, 2014-12-03 at 20:49 -0500, Kevin Pietsch wrote:
> Removed braces from two single line if-else statements
Another perhaps better option is to use ?: like:
---
drivers/staging/ft1000/ft1000-pcmcia/ft1000_hw.c | 14 ++++----------
1 file changed, 4 insertions(+), 10 deletions(-)
diff --git a/drivers/staging/ft1000/ft1000-pcmcia/ft1000_hw.c b/drivers/staging/ft1000/ft1000-pcmcia/ft1000_hw.c
index 0038a3a..8743516 100644
--- a/drivers/staging/ft1000/ft1000-pcmcia/ft1000_hw.c
+++ b/drivers/staging/ft1000/ft1000-pcmcia/ft1000_hw.c
@@ -172,11 +172,8 @@ 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) {
- data = ft1000_read_reg(dev, FT1000_REG_MAG_DPDATAL);
- } else {
- data = ft1000_read_reg(dev, FT1000_REG_MAG_DPDATAH);
- }
+ data = ft1000_read_reg(dev, index ? FT1000_REG_MAG_DPDATAL
+ : FT1000_REG_MAG_DPDATAH);
spin_unlock_irqrestore(&info->dpram_lock, flags);
return data;
@@ -204,11 +201,8 @@ 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) {
- ft1000_write_reg(dev, FT1000_REG_MAG_DPDATAL, value);
- } else {
- ft1000_write_reg(dev, FT1000_REG_MAG_DPDATAH, value);
- }
+ ft1000_write_reg(dev, index ? FT1000_REG_MAG_DPDATAL
+ : FT1000_REG_MAG_DPDATAH, value);
spin_unlock_irqrestore(&info->dpram_lock, flags);
}
_______________________________________________
devel mailing list
devel@xxxxxxxxxxxxxxxxxxxxxx
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
