Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

DSA: Convert spaces to tabs where appropriate

Browse source 
Fix DSA whitespace issues reported by checkpatch.pl

Signed-off-by: Barry Grussling <barry@grussling.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Barry Grussling 2013-01-08 16:05:56 +00:00 committed by David S. Miller
parent ab381a93ec
commit 8568658148
2 changed files with 23 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

44
drivers/net/dsa/mv88e6xxx.c
View file

@ -205,10 +205,10 @@ static int mv88e6xxx_ppu_disable(struct dsa_switch *ds)
timeout = jiffies + 1 * HZ; timeout = jiffies + 1 * HZ;
while (time_before(jiffies, timeout)) { while (time_before(jiffies, timeout)) {
ret = REG_READ(REG_GLOBAL, 0x00); ret = REG_READ(REG_GLOBAL, 0x00);
usleep_range(1000, 2000); usleep_range(1000, 2000);
if ((ret & 0xc000) != 0xc000) if ((ret & 0xc000) != 0xc000)
return 0; return 0;
} }
return -ETIMEDOUT; return -ETIMEDOUT;
@ -224,10 +224,10 @@ static int mv88e6xxx_ppu_enable(struct dsa_switch *ds)
timeout = jiffies + 1 * HZ; timeout = jiffies + 1 * HZ;
while (time_before(jiffies, timeout)) { while (time_before(jiffies, timeout)) {
ret = REG_READ(REG_GLOBAL, 0x00); ret = REG_READ(REG_GLOBAL, 0x00);
usleep_range(1000, 2000); usleep_range(1000, 2000);
if ((ret & 0xc000) == 0xc000) if ((ret & 0xc000) == 0xc000)
return 0; return 0;
} }
return -ETIMEDOUT; return -ETIMEDOUT;
@ -239,11 +239,11 @@ static void mv88e6xxx_ppu_reenable_work(struct work_struct *ugly)
ps = container_of(ugly, struct mv88e6xxx_priv_state, ppu_work); ps = container_of(ugly, struct mv88e6xxx_priv_state, ppu_work);
if (mutex_trylock(&ps->ppu_mutex)) { if (mutex_trylock(&ps->ppu_mutex)) {
struct dsa_switch *ds = ((struct dsa_switch *)ps) - 1; struct dsa_switch *ds = ((struct dsa_switch *)ps) - 1;
if (mv88e6xxx_ppu_enable(ds) == 0) if (mv88e6xxx_ppu_enable(ds) == 0)
ps->ppu_disabled = 0; ps->ppu_disabled = 0;
mutex_unlock(&ps->ppu_mutex); mutex_unlock(&ps->ppu_mutex);
} }
} }
@ -267,15 +267,15 @@ static int mv88e6xxx_ppu_access_get(struct dsa_switch *ds)
* it. * it.
*/ */
if (!ps->ppu_disabled) { if (!ps->ppu_disabled) {
ret = mv88e6xxx_ppu_disable(ds); ret = mv88e6xxx_ppu_disable(ds);
if (ret < 0) { if (ret < 0) {
mutex_unlock(&ps->ppu_mutex); mutex_unlock(&ps->ppu_mutex);
return ret; return ret;
} }
ps->ppu_disabled = 1; ps->ppu_disabled = 1;
} else { } else {
del_timer(&ps->ppu_timer); del_timer(&ps->ppu_timer);
ret = 0; ret = 0;
} }
return ret; return ret;
@ -307,8 +307,8 @@ int mv88e6xxx_phy_read_ppu(struct dsa_switch *ds, int addr, int regnum)
ret = mv88e6xxx_ppu_access_get(ds); ret = mv88e6xxx_ppu_access_get(ds);
if (ret >= 0) { if (ret >= 0) {
ret = mv88e6xxx_reg_read(ds, addr, regnum); ret = mv88e6xxx_reg_read(ds, addr, regnum);
mv88e6xxx_ppu_access_put(ds); mv88e6xxx_ppu_access_put(ds);
} }
return ret; return ret;
@ -321,8 +321,8 @@ int mv88e6xxx_phy_write_ppu(struct dsa_switch *ds, int addr,
ret = mv88e6xxx_ppu_access_get(ds); ret = mv88e6xxx_ppu_access_get(ds);
if (ret >= 0) { if (ret >= 0) {
ret = mv88e6xxx_reg_write(ds, addr, regnum, val); ret = mv88e6xxx_reg_write(ds, addr, regnum, val);
mv88e6xxx_ppu_access_put(ds); mv88e6xxx_ppu_access_put(ds);
} }
return ret; return ret;

2
drivers/net/dsa/mv88e6xxx.h
View file

@ -49,7 +49,7 @@ struct mv88e6xxx_hw_stat {
int __mv88e6xxx_reg_read(struct mii_bus *bus, int sw_addr, int addr, int reg); int __mv88e6xxx_reg_read(struct mii_bus *bus, int sw_addr, int addr, int reg);
int mv88e6xxx_reg_read(struct dsa_switch *ds, int addr, int reg); int mv88e6xxx_reg_read(struct dsa_switch *ds, int addr, int reg);
int __mv88e6xxx_reg_write(struct mii_bus *bus, int sw_addr, int addr, int __mv88e6xxx_reg_write(struct mii_bus *bus, int sw_addr, int addr,
int reg, u16 val); int reg, u16 val);
int mv88e6xxx_reg_write(struct dsa_switch *ds, int addr, int reg, u16 val); int mv88e6xxx_reg_write(struct dsa_switch *ds, int addr, int reg, u16 val);
int mv88e6xxx_config_prio(struct dsa_switch *ds); int mv88e6xxx_config_prio(struct dsa_switch *ds);
int mv88e6xxx_set_addr_direct(struct dsa_switch *ds, u8 *addr); int mv88e6xxx_set_addr_direct(struct dsa_switch *ds, u8 *addr);