Staging: ft1000: fix some coding style issues
PATCH 1/1 Staging: ft1000: fix some coding style issues
Removed braces from two single line if-else statements
Signed-off-by Kevin Pietsch <[email protected]>
--- drivers/staging/ft1000/ft1000-pcmcia/ft1000_hw.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-)
drivers/staging/ft1000/ft1000-pcmcia/ft1000_hw.c +4 -6
@@ -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); }
Signature · 1 line
2.1.0
Quoted 1 line · Kevin Pietsch
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(-)
drivers/staging/ft1000/ft1000-pcmcia/ft1000_hw.c +4 -10
@@ -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); }