Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 930188ce authored by Andrew Lunn's avatar Andrew Lunn Committed by David S. Miller
Browse files

dsa: mv88e6xxx: Delete ppu timer when removing module 



The PPU method of accessing PHYs makes use of a timer. Make sure this
timer is deleted before unloading the driver.

Reported-by: default avatarJamie Lentin <jm@lentin.co.uk>
Signed-off-by: default avatarAndrew Lunn <andrew@lunn.ch>
Reviewed-by: default avatarVivien Didelot <vivien.didelot@savoirfairelinux.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 2bbb33be

drivers/net/dsa/mv88e6xxx/chip.c

+13 −0
Original line number Diff line number Diff line
@@ -486,6 +486,11 @@ static void mv88e6xxx_ppu_state_init(struct mv88e6xxx_chip *chip) 
	chip->ppu_timer.function = mv88e6xxx_ppu_reenable_timer;

}



static void mv88e6xxx_ppu_state_destroy(struct mv88e6xxx_chip *chip)

{

	del_timer_sync(&chip->ppu_timer);

}



static int mv88e6xxx_phy_ppu_read(struct mv88e6xxx_chip *chip, int addr,

				  int reg, u16 *val)

{
@@ -3892,6 +3897,13 @@ static void mv88e6xxx_phy_init(struct mv88e6xxx_chip *chip) 
	}

}



static void mv88e6xxx_phy_destroy(struct mv88e6xxx_chip *chip)

{

	if (mv88e6xxx_has(chip, MV88E6XXX_FLAG_PPU)) {

		mv88e6xxx_ppu_state_destroy(chip);

	}

}



static int mv88e6xxx_smi_init(struct mv88e6xxx_chip *chip,

			      struct mii_bus *bus, int sw_addr)

{
@@ -4080,6 +4092,7 @@ static void mv88e6xxx_remove(struct mdio_device *mdiodev) 
	struct dsa_switch *ds = dev_get_drvdata(&mdiodev->dev);

	struct mv88e6xxx_chip *chip = ds_to_priv(ds);



	mv88e6xxx_phy_destroy(chip);

	mv88e6xxx_unregister_switch(chip);

	mv88e6xxx_mdio_unregister(chip);

}