net: dsa: mv88e6xxx: add common and ppu remove function
Subsystems (3)
RFC PATCH 2/3 net: dsa: mv88e6xxx: add common and ppu remove function
With the previously introduced remove callback, add a mv88e6xxx common remove function to cleanup all ressources.
Signed-off-by Neil Armstrong <[email protected]>
--- drivers/net/dsa/mv88e6xxx.c | 18 ++++++++++++++++++ drivers/net/dsa/mv88e6xxx.h | 2 ++ 2 files changed, 20 insertions(+)
drivers/net/dsa/mv88e6xxx.c +18 -0
@@ -331,6 +331,16 @@ void mv88e6xxx_ppu_state_init(struct dsa_switch *ds) ps->ppu_timer.function = mv88e6xxx_ppu_reenable_timer; } +void mv88e6xxx_ppu_state_remove (struct dsa_switch *ds) +{ +struct mv88e6xxx_priv_state *ps =ds_to_priv (ds); + +del_timer_sync (&ps->ppu_timer); + +cancel_work_sync (&ps->bridge_work); +flush_work (&ps->bridge_work); +} +int mv88e6xxx_phy_read_ppu (struct dsa_switch *ds,int addr,int regnum) {int ret;
@@ -2083,6 +2093,14 @@ int mv88e6xxx_setup_common(struct dsa_switch *ds)return 0 ; } +void mv88e6xxx_remove_common (struct dsa_switch *ds) +{ +struct mv88e6xxx_priv_state *ps =ds_to_priv (ds); + +cancel_work_sync (&ps->bridge_work); +flush_work (&ps->bridge_work); +} +int mv88e6xxx_setup_global (struct dsa_switch *ds) {struct mv88e6xxx_priv_state *ps =ds_to_priv (ds);
drivers/net/dsa/mv88e6xxx.h +2 -0
@@ -417,6 +417,7 @@ struct mv88e6xxx_hw_stat {int mv88e6xxx_switch_reset (struct dsa_switch *ds,bool ppu_active);int mv88e6xxx_setup_ports (struct dsa_switch *ds);int mv88e6xxx_setup_common (struct dsa_switch *ds); +void mv88e6xxx_remove_common (struct dsa_switch *ds);int mv88e6xxx_setup_global (struct dsa_switch *ds);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);
@@ -431,6 +432,7 @@ int mv88e6xxx_phy_read_indirect(struct dsa_switch *ds, int port, int regnum);int mv88e6xxx_phy_write_indirect (struct dsa_switch *ds,int port,int regnum,u16 val);void mv88e6xxx_ppu_state_init (struct dsa_switch *ds); +void mv88e6xxx_ppu_state_remove (struct dsa_switch *ds);int mv88e6xxx_phy_read_ppu (struct dsa_switch *ds,int addr,int regnum);int mv88e6xxx_phy_write_ppu (struct dsa_switch *ds,int addr,int regnum,u16 val);
Signature · 1 line
1.9.1