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

net: dsa: use switchdev_obj_dump_cb_t everywhere 



Now that the DSA public header includes switchdev.h, use the provided
switchdev_obj_dump_cb_t typedef for the object dump callback.

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

drivers/net/dsa/b53/b53_common.c

+3 −3
Original line number Diff line number Diff line
@@ -1055,7 +1055,7 @@ EXPORT_SYMBOL(b53_vlan_del); 


int b53_vlan_dump(struct dsa_switch *ds, int port,

		  struct switchdev_obj_port_vlan *vlan,

		  int (*cb)(struct switchdev_obj *obj))

		  switchdev_obj_dump_cb_t *cb)

{

	struct b53_device *dev = ds->priv;

	u16 vid, vid_start = 0, pvid;
@@ -1284,7 +1284,7 @@ static void b53_arl_search_rd(struct b53_device *dev, u8 idx, 
static int b53_fdb_copy(struct net_device *dev, int port,

			const struct b53_arl_entry *ent,

			struct switchdev_obj_port_fdb *fdb,

			int (*cb)(struct switchdev_obj *obj))

			switchdev_obj_dump_cb_t *cb)

{

	if (!ent->is_valid)

		return 0;
@@ -1301,7 +1301,7 @@ static int b53_fdb_copy(struct net_device *dev, int port, 


int b53_fdb_dump(struct dsa_switch *ds, int port,

		 struct switchdev_obj_port_fdb *fdb,

		 int (*cb)(struct switchdev_obj *obj))

		 switchdev_obj_dump_cb_t *cb)

{

	struct b53_device *priv = ds->priv;

	struct net_device *dev = ds->ports[port].netdev;

drivers/net/dsa/b53/b53_priv.h

+2 −2
Original line number Diff line number Diff line
@@ -395,7 +395,7 @@ int b53_vlan_del(struct dsa_switch *ds, int port, 
		 const struct switchdev_obj_port_vlan *vlan);

int b53_vlan_dump(struct dsa_switch *ds, int port,

		  struct switchdev_obj_port_vlan *vlan,

		  int (*cb)(struct switchdev_obj *obj));

		  switchdev_obj_dump_cb_t *cb);

int b53_fdb_prepare(struct dsa_switch *ds, int port,

		    const struct switchdev_obj_port_fdb *fdb,

		    struct switchdev_trans *trans);
@@ -406,7 +406,7 @@ int b53_fdb_del(struct dsa_switch *ds, int port, 
		const struct switchdev_obj_port_fdb *fdb);

int b53_fdb_dump(struct dsa_switch *ds, int port,

		 struct switchdev_obj_port_fdb *fdb,

		 int (*cb)(struct switchdev_obj *obj));

		 switchdev_obj_dump_cb_t *cb);

int b53_mirror_add(struct dsa_switch *ds, int port,

		   struct dsa_mall_mirror_tc_entry *mirror, bool ingress);

void b53_mirror_del(struct dsa_switch *ds, int port,

drivers/net/dsa/dsa_loop.c

+1 −1
Original line number Diff line number Diff line
@@ -187,7 +187,7 @@ static int dsa_loop_port_vlan_del(struct dsa_switch *ds, int port, 


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

				   struct switchdev_obj_port_vlan *vlan,

				   int (*cb)(struct switchdev_obj *obj))

				   switchdev_obj_dump_cb_t *cb)

{

	struct dsa_loop_priv *ps = ds->priv;

	struct mii_bus *bus = ps->bus;

drivers/net/dsa/mt7530.c

+1 −1
Original line number Diff line number Diff line
@@ -853,7 +853,7 @@ mt7530_port_fdb_del(struct dsa_switch *ds, int port, 
static int

mt7530_port_fdb_dump(struct dsa_switch *ds, int port,

		     struct switchdev_obj_port_fdb *fdb,

		     int (*cb)(struct switchdev_obj *obj))

		     switchdev_obj_dump_cb_t *cb)

{

	struct mt7530_priv *priv = ds->priv;

	struct mt7530_fdb _fdb = { 0 };

drivers/net/dsa/mv88e6xxx/chip.c

+5 −5
Original line number Diff line number Diff line
@@ -1268,7 +1268,7 @@ static int mv88e6xxx_vtu_loadpurge(struct mv88e6xxx_chip *chip, 


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

				    struct switchdev_obj_port_vlan *vlan,

				    int (*cb)(struct switchdev_obj *obj))

				    switchdev_obj_dump_cb_t *cb)

{

	struct mv88e6xxx_chip *chip = ds->priv;

	struct mv88e6xxx_vtu_entry next = {
@@ -1699,7 +1699,7 @@ static int mv88e6xxx_port_fdb_del(struct dsa_switch *ds, int port, 
static int mv88e6xxx_port_db_dump_fid(struct mv88e6xxx_chip *chip,

				      u16 fid, u16 vid, int port,

				      struct switchdev_obj *obj,

				      int (*cb)(struct switchdev_obj *obj))

				      switchdev_obj_dump_cb_t *cb)

{

	struct mv88e6xxx_atu_entry addr;

	int err;
@@ -1754,7 +1754,7 @@ static int mv88e6xxx_port_db_dump_fid(struct mv88e6xxx_chip *chip, 


static int mv88e6xxx_port_db_dump(struct mv88e6xxx_chip *chip, int port,

				  struct switchdev_obj *obj,

				  int (*cb)(struct switchdev_obj *obj))

				  switchdev_obj_dump_cb_t *cb)

{

	struct mv88e6xxx_vtu_entry vlan = {

		.vid = chip->info->max_vid,
@@ -1791,7 +1791,7 @@ static int mv88e6xxx_port_db_dump(struct mv88e6xxx_chip *chip, int port, 


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

				   struct switchdev_obj_port_fdb *fdb,

				   int (*cb)(struct switchdev_obj *obj))

				   switchdev_obj_dump_cb_t *cb)

{

	struct mv88e6xxx_chip *chip = ds->priv;

	int err;
@@ -4037,7 +4037,7 @@ static int mv88e6xxx_port_mdb_del(struct dsa_switch *ds, int port, 


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

				   struct switchdev_obj_port_mdb *mdb,

				   int (*cb)(struct switchdev_obj *obj))

				   switchdev_obj_dump_cb_t *cb)

{

	struct mv88e6xxx_chip *chip = ds->priv;

	int err;