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

Commit fc0bc019 authored by Vivien Didelot's avatar Vivien Didelot Committed by David S. Miller
Browse files

net: dsa: mv88e6xxx: wrap SERDES IRQ in power function 



Now that mv88e6xxx_serdes_power is only called after driver setup,
we can wrap the SERDES IRQ code directly within it for clarity.

Signed-off-by: default avatarVivien Didelot <vivien.didelot@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent b759f528

drivers/net/dsa/mv88e6xxx/chip.c

+19 −13
Original line number Diff line number Diff line
@@ -2057,10 +2057,26 @@ static int mv88e6xxx_setup_egress_floods(struct mv88e6xxx_chip *chip, int port) 
static int mv88e6xxx_serdes_power(struct mv88e6xxx_chip *chip, int port,

				  bool on)

{

	if (chip->info->ops->serdes_power)

		return chip->info->ops->serdes_power(chip, port, on);

	int err;



	if (!chip->info->ops->serdes_power)

		return 0;



	if (on) {

		err = chip->info->ops->serdes_power(chip, port, true);

		if (err)

			return err;



		if (chip->info->ops->serdes_irq_setup)

			err = chip->info->ops->serdes_irq_setup(chip, port);

	} else {

		if (chip->info->ops->serdes_irq_free)

			chip->info->ops->serdes_irq_free(chip, port);



		err = chip->info->ops->serdes_power(chip, port, false);

	}



	return err;

}



static int mv88e6xxx_setup_upstream_port(struct mv88e6xxx_chip *chip, int port)
@@ -2258,12 +2274,7 @@ static int mv88e6xxx_port_enable(struct dsa_switch *ds, int port, 
	int err;



	mv88e6xxx_reg_lock(chip);



	err = mv88e6xxx_serdes_power(chip, port, true);



	if (!err && chip->info->ops->serdes_irq_setup)

		err = chip->info->ops->serdes_irq_setup(chip, port);



	mv88e6xxx_reg_unlock(chip);



	return err;
@@ -2274,13 +2285,8 @@ static void mv88e6xxx_port_disable(struct dsa_switch *ds, int port) 
	struct mv88e6xxx_chip *chip = ds->priv;



	mv88e6xxx_reg_lock(chip);



	if (chip->info->ops->serdes_irq_free)

		chip->info->ops->serdes_irq_free(chip, port);



	if (mv88e6xxx_serdes_power(chip, port, false))

		dev_err(chip->dev, "failed to power off SERDES\n");



	mv88e6xxx_reg_unlock(chip);

}