| Message ID | 5630D7FC.4010509@baylibre.com |
|---|---|
| State | RFC, archived |
| Delegated to: | David Miller |
| Headers | show |
On Wed, Oct 28, 2015 at 03:13:16PM +0100, Neil Armstrong wrote: > With the previously introduced remove callback, add a > mv88e6xxx common remove function to cleanup all resources. > > Signed-off-by: Neil Armstrong <narmstrong@baylibre.com> > --- > drivers/net/dsa/mv88e6xxx.c | 18 ++++++++++++++++++ > drivers/net/dsa/mv88e6xxx.h | 2 ++ > 2 files changed, 20 insertions(+) > > diff --git a/drivers/net/dsa/mv88e6xxx.c b/drivers/net/dsa/mv88e6xxx.c > index b1b14f5..6287096 100644 > --- a/drivers/net/dsa/mv88e6xxx.c > +++ b/drivers/net/dsa/mv88e6xxx.c > @@ -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); > +} > + You add this function, but you don't use it anywhere? Also, why cancel bridge work, not ppu_work? Or has that been consolidated in some patch i'm missing? Andrew -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Hi Andrew, On 10/28/2015 03:35 PM, Andrew Lunn wrote: > On Wed, Oct 28, 2015 at 03:13:16PM +0100, Neil Armstrong wrote: >> diff --git a/drivers/net/dsa/mv88e6xxx.c b/drivers/net/dsa/mv88e6xxx.c >> index b1b14f5..6287096 100644 >> --- a/drivers/net/dsa/mv88e6xxx.c >> +++ b/drivers/net/dsa/mv88e6xxx.c >> @@ -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); >> +} >> + > > You add this function, but you don't use it anywhere? Also, why > cancel bridge work, not ppu_work? Or has that been consolidated > in some patch i'm missing? > > Andrew > It's called in the next patch, in mv88e6131_remove for mv88e6131. Neil -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Wed, Oct 28, 2015 at 03:37:02PM +0100, Neil Armstrong wrote: > Hi Andrew, > > On 10/28/2015 03:35 PM, Andrew Lunn wrote: > > On Wed, Oct 28, 2015 at 03:13:16PM +0100, Neil Armstrong wrote: > >> diff --git a/drivers/net/dsa/mv88e6xxx.c b/drivers/net/dsa/mv88e6xxx.c > >> index b1b14f5..6287096 100644 > >> --- a/drivers/net/dsa/mv88e6xxx.c > >> +++ b/drivers/net/dsa/mv88e6xxx.c > >> @@ -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); > >> +} > >> + > > > > You add this function, but you don't use it anywhere? Also, why > > cancel bridge work, not ppu_work? Or has that been consolidated > > in some patch i'm missing? > > > > Andrew > > > > It's called in the next patch, in mv88e6131_remove for mv88e6131. Hi Neil It would be better to split this out into a patch of its own, and include the mv88e6131 change with it. Andrew -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/net/dsa/mv88e6xxx.c b/drivers/net/dsa/mv88e6xxx.c index b1b14f5..6287096 100644 --- a/drivers/net/dsa/mv88e6xxx.c +++ b/drivers/net/dsa/mv88e6xxx.c @@ -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); diff --git a/drivers/net/dsa/mv88e6xxx.h b/drivers/net/dsa/mv88e6xxx.h index 6f9ed5d..64d37a0 100644 --- a/drivers/net/dsa/mv88e6xxx.h +++ b/drivers/net/dsa/mv88e6xxx.h @@ -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);
With the previously introduced remove callback, add a mv88e6xxx common remove function to cleanup all resources. Signed-off-by: Neil Armstrong <narmstrong@baylibre.com> --- drivers/net/dsa/mv88e6xxx.c | 18 ++++++++++++++++++ drivers/net/dsa/mv88e6xxx.h | 2 ++ 2 files changed, 20 insertions(+)