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

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

net: dsa: remove trans argument from mdb ops 



The DSA switch MDB ops pass the switchdev_trans structure down to the
drivers, but no one is using them and they aren't supposed to anyway.

Remove the trans argument from MDB prepare and add operations.

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

drivers/net/dsa/lan9303-core.c

+2 −4
Original line number Diff line number Diff line
@@ -1217,8 +1217,7 @@ static int lan9303_port_fdb_dump(struct dsa_switch *ds, int port, 
}



static int lan9303_port_mdb_prepare(struct dsa_switch *ds, int port,

				    const struct switchdev_obj_port_mdb *mdb,

				    struct switchdev_trans *trans)

				    const struct switchdev_obj_port_mdb *mdb)

{

	struct lan9303 *chip = ds->priv;
@@ -1235,8 +1234,7 @@ static int lan9303_port_mdb_prepare(struct dsa_switch *ds, int port, 
}



static void lan9303_port_mdb_add(struct dsa_switch *ds, int port,

				 const struct switchdev_obj_port_mdb *mdb,

				 struct switchdev_trans *trans)

				 const struct switchdev_obj_port_mdb *mdb)

{

	struct lan9303 *chip = ds->priv;

drivers/net/dsa/microchip/ksz_common.c

+2 −4
Original line number Diff line number Diff line
@@ -856,16 +856,14 @@ static int ksz_port_fdb_dump(struct dsa_switch *ds, int port, 
}



static int ksz_port_mdb_prepare(struct dsa_switch *ds, int port,

				const struct switchdev_obj_port_mdb *mdb,

				struct switchdev_trans *trans)

				const struct switchdev_obj_port_mdb *mdb)

{

	/* nothing to do */

	return 0;

}



static void ksz_port_mdb_add(struct dsa_switch *ds, int port,

			     const struct switchdev_obj_port_mdb *mdb,

			     struct switchdev_trans *trans)

			     const struct switchdev_obj_port_mdb *mdb)

{

	struct ksz_device *dev = ds->priv;

	u32 static_table[4];

drivers/net/dsa/mv88e6xxx/chip.c

+2 −4
Original line number Diff line number Diff line
@@ -3786,8 +3786,7 @@ static const char *mv88e6xxx_drv_probe(struct device *dsa_dev, 
}



static int mv88e6xxx_port_mdb_prepare(struct dsa_switch *ds, int port,

				      const struct switchdev_obj_port_mdb *mdb,

				      struct switchdev_trans *trans)

				      const struct switchdev_obj_port_mdb *mdb)

{

	/* We don't need any dynamic resource from the kernel (yet),

	 * so skip the prepare phase.
@@ -3797,8 +3796,7 @@ static int mv88e6xxx_port_mdb_prepare(struct dsa_switch *ds, int port, 
}



static void mv88e6xxx_port_mdb_add(struct dsa_switch *ds, int port,

				   const struct switchdev_obj_port_mdb *mdb,

				   struct switchdev_trans *trans)

				   const struct switchdev_obj_port_mdb *mdb)

{

	struct mv88e6xxx_chip *chip = ds->priv;

include/net/dsa.h

+4 −6
Original line number Diff line number Diff line
@@ -432,11 +432,9 @@ struct dsa_switch_ops { 
	 * Multicast database

	 */

	int (*port_mdb_prepare)(struct dsa_switch *ds, int port,

				    const struct switchdev_obj_port_mdb *mdb,

				    struct switchdev_trans *trans);

				const struct switchdev_obj_port_mdb *mdb);

	void (*port_mdb_add)(struct dsa_switch *ds, int port,

				const struct switchdev_obj_port_mdb *mdb,

				struct switchdev_trans *trans);

			     const struct switchdev_obj_port_mdb *mdb);

	int	(*port_mdb_del)(struct dsa_switch *ds, int port,

				const struct switchdev_obj_port_mdb *mdb);

	/*

net/dsa/switch.c

+2 −2
Original line number Diff line number Diff line
@@ -129,7 +129,7 @@ static int dsa_switch_mdb_add(struct dsa_switch *ds, 
			return -EOPNOTSUPP;



		for_each_set_bit(port, group, ds->num_ports) {

			err = ds->ops->port_mdb_prepare(ds, port, mdb, trans);

			err = ds->ops->port_mdb_prepare(ds, port, mdb);

			if (err)

				return err;

		}
@@ -138,7 +138,7 @@ static int dsa_switch_mdb_add(struct dsa_switch *ds, 
	}



	for_each_set_bit(port, group, ds->num_ports)

		ds->ops->port_mdb_add(ds, port, mdb, trans);

		ds->ops->port_mdb_add(ds, port, mdb);



	return 0;

}