DSA: Convert spaces to tabs where appropriate
authorBarry Grussling <barry@grussling.com>
Tue, 8 Jan 2013 16:05:56 +0000 (16:05 +0000)
committerDavid S. Miller <davem@davemloft.net>
Thu, 10 Jan 2013 08:04:34 +0000 (00:04 -0800)
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>
drivers/net/dsa/mv88e6xxx.c
drivers/net/dsa/mv88e6xxx.h

index 3756c74ca4be09efbea0b17bde42c3691e7f9bfa..17314ed9456d32c961aea31db10a650a2ffb1392 100644 (file)
@@ -205,10 +205,10 @@ static int mv88e6xxx_ppu_disable(struct dsa_switch *ds)
 
        timeout = jiffies + 1 * HZ;
        while (time_before(jiffies, timeout)) {
-               ret = REG_READ(REG_GLOBAL, 0x00);
+               ret = REG_READ(REG_GLOBAL, 0x00);
                usleep_range(1000, 2000);
-               if ((ret & 0xc000) != 0xc000)
-                       return 0;
+               if ((ret & 0xc000) != 0xc000)
+                       return 0;
        }
 
        return -ETIMEDOUT;
@@ -224,10 +224,10 @@ static int mv88e6xxx_ppu_enable(struct dsa_switch *ds)
 
        timeout = jiffies + 1 * HZ;
        while (time_before(jiffies, timeout)) {
-               ret = REG_READ(REG_GLOBAL, 0x00);
+               ret = REG_READ(REG_GLOBAL, 0x00);
                usleep_range(1000, 2000);
-               if ((ret & 0xc000) == 0xc000)
-                       return 0;
+               if ((ret & 0xc000) == 0xc000)
+                       return 0;
        }
 
        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);
        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)
-                       ps->ppu_disabled = 0;
-               mutex_unlock(&ps->ppu_mutex);
+               if (mv88e6xxx_ppu_enable(ds) == 0)
+                       ps->ppu_disabled = 0;
+               mutex_unlock(&ps->ppu_mutex);
        }
 }
 
@@ -267,15 +267,15 @@ static int mv88e6xxx_ppu_access_get(struct dsa_switch *ds)
         * it.
         */
        if (!ps->ppu_disabled) {
-               ret = mv88e6xxx_ppu_disable(ds);
-               if (ret < 0) {
-                       mutex_unlock(&ps->ppu_mutex);
-                       return ret;
-               }
-               ps->ppu_disabled = 1;
+               ret = mv88e6xxx_ppu_disable(ds);
+               if (ret < 0) {
+                       mutex_unlock(&ps->ppu_mutex);
+                       return ret;
+               }
+               ps->ppu_disabled = 1;
        } else {
-               del_timer(&ps->ppu_timer);
-               ret = 0;
+               del_timer(&ps->ppu_timer);
+               ret = 0;
        }
 
        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);
        if (ret >= 0) {
-               ret = mv88e6xxx_reg_read(ds, addr, regnum);
-               mv88e6xxx_ppu_access_put(ds);
+               ret = mv88e6xxx_reg_read(ds, addr, regnum);
+               mv88e6xxx_ppu_access_put(ds);
        }
 
        return ret;
@@ -321,8 +321,8 @@ int mv88e6xxx_phy_write_ppu(struct dsa_switch *ds, int addr,
 
        ret = mv88e6xxx_ppu_access_get(ds);
        if (ret >= 0) {
-               ret = mv88e6xxx_reg_write(ds, addr, regnum, val);
-               mv88e6xxx_ppu_access_put(ds);
+               ret = mv88e6xxx_reg_write(ds, addr, regnum, val);
+               mv88e6xxx_ppu_access_put(ds);
        }
 
        return ret;
index 029e13d05e5d2b5d3ea8164503ec405bdcff7943..911ede58dd12d22223cfa71cce53e32eba55f5f8 100644 (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 dsa_switch *ds, int addr, int reg);
 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_config_prio(struct dsa_switch *ds);
 int mv88e6xxx_set_addr_direct(struct dsa_switch *ds, u8 *addr);