···205205206206 timeout = jiffies + 1 * HZ;207207 while (time_before(jiffies, timeout)) {208208- ret = REG_READ(REG_GLOBAL, 0x00);208208+ ret = REG_READ(REG_GLOBAL, 0x00);209209 usleep_range(1000, 2000);210210- if ((ret & 0xc000) != 0xc000)211211- return 0;210210+ if ((ret & 0xc000) != 0xc000)211211+ return 0;212212 }213213214214 return -ETIMEDOUT;···224224225225 timeout = jiffies + 1 * HZ;226226 while (time_before(jiffies, timeout)) {227227- ret = REG_READ(REG_GLOBAL, 0x00);227227+ ret = REG_READ(REG_GLOBAL, 0x00);228228 usleep_range(1000, 2000);229229- if ((ret & 0xc000) == 0xc000)230230- return 0;229229+ if ((ret & 0xc000) == 0xc000)230230+ return 0;231231 }232232233233 return -ETIMEDOUT;···239239240240 ps = container_of(ugly, struct mv88e6xxx_priv_state, ppu_work);241241 if (mutex_trylock(&ps->ppu_mutex)) {242242- struct dsa_switch *ds = ((struct dsa_switch *)ps) - 1;242242+ struct dsa_switch *ds = ((struct dsa_switch *)ps) - 1;243243244244- if (mv88e6xxx_ppu_enable(ds) == 0)245245- ps->ppu_disabled = 0;246246- mutex_unlock(&ps->ppu_mutex);244244+ if (mv88e6xxx_ppu_enable(ds) == 0)245245+ ps->ppu_disabled = 0;246246+ mutex_unlock(&ps->ppu_mutex);247247 }248248}249249···267267 * it.268268 */269269 if (!ps->ppu_disabled) {270270- ret = mv88e6xxx_ppu_disable(ds);271271- if (ret < 0) {272272- mutex_unlock(&ps->ppu_mutex);273273- return ret;274274- }275275- ps->ppu_disabled = 1;270270+ ret = mv88e6xxx_ppu_disable(ds);271271+ if (ret < 0) {272272+ mutex_unlock(&ps->ppu_mutex);273273+ return ret;274274+ }275275+ ps->ppu_disabled = 1;276276 } else {277277- del_timer(&ps->ppu_timer);278278- ret = 0;277277+ del_timer(&ps->ppu_timer);278278+ ret = 0;279279 }280280281281 return ret;···307307308308 ret = mv88e6xxx_ppu_access_get(ds);309309 if (ret >= 0) {310310- ret = mv88e6xxx_reg_read(ds, addr, regnum);311311- mv88e6xxx_ppu_access_put(ds);310310+ ret = mv88e6xxx_reg_read(ds, addr, regnum);311311+ mv88e6xxx_ppu_access_put(ds);312312 }313313314314 return ret;···321321322322 ret = mv88e6xxx_ppu_access_get(ds);323323 if (ret >= 0) {324324- ret = mv88e6xxx_reg_write(ds, addr, regnum, val);325325- mv88e6xxx_ppu_access_put(ds);324324+ ret = mv88e6xxx_reg_write(ds, addr, regnum, val);325325+ mv88e6xxx_ppu_access_put(ds);326326 }327327328328 return ret;
+1-1
drivers/net/dsa/mv88e6xxx.h
···4949int __mv88e6xxx_reg_read(struct mii_bus *bus, int sw_addr, int addr, int reg);5050int mv88e6xxx_reg_read(struct dsa_switch *ds, int addr, int reg);5151int __mv88e6xxx_reg_write(struct mii_bus *bus, int sw_addr, int addr,5252- int reg, u16 val);5252+ int reg, u16 val);5353int mv88e6xxx_reg_write(struct dsa_switch *ds, int addr, int reg, u16 val);5454int mv88e6xxx_config_prio(struct dsa_switch *ds);5555int mv88e6xxx_set_addr_direct(struct dsa_switch *ds, u8 *addr);