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: Vivien Didelot <vivien.didelot@savoirfairelinux.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/dsa/b53/b53_common.c b/drivers/net/dsa/b53/b53_common.c
index fbc3eb1..fa099ed 100644 (file)
--- a/drivers/net/dsa/b53/b53_common.c
+++ b/drivers/net/dsa/b53/b53_common.c
@@ -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;

diff --git a/drivers/net/dsa/b53/b53_priv.h b/drivers/net/dsa/b53/b53_priv.h
index a9dc90a..155a9c4 100644 (file)
--- a/drivers/net/dsa/b53/b53_priv.h
+++ b/drivers/net/dsa/b53/b53_priv.h
@@ -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,

diff --git a/drivers/net/dsa/dsa_loop.c b/drivers/net/dsa/dsa_loop.c
index 6afab16..5edf07b 100644 (file)
--- a/drivers/net/dsa/dsa_loop.c
+++ b/drivers/net/dsa/dsa_loop.c
@@ -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;

diff --git a/drivers/net/dsa/mt7530.c b/drivers/net/dsa/mt7530.c
index 1bcbe15..4d2f451 100644 (file)
--- a/drivers/net/dsa/mt7530.c
+++ b/drivers/net/dsa/mt7530.c
@@ -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 };

diff --git a/drivers/net/dsa/mv88e6xxx/chip.c b/drivers/net/dsa/mv88e6xxx/chip.c
index 386d878..41de250 100644 (file)
--- a/drivers/net/dsa/mv88e6xxx/chip.c
+++ b/drivers/net/dsa/mv88e6xxx/chip.c
@@ -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;

diff --git a/drivers/net/dsa/qca8k.c b/drivers/net/dsa/qca8k.c
index 149f109..0f6a011 100644 (file)
--- a/drivers/net/dsa/qca8k.c
+++ b/drivers/net/dsa/qca8k.c
@@ -872,7 +872,7 @@ qca8k_port_fdb_del(struct dsa_switch *ds, int port,
 static int
 qca8k_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 qca8k_priv *priv = (struct qca8k_priv *)ds->priv;
        struct qca8k_fdb _fdb = { 0 };

diff --git a/include/net/dsa.h b/include/net/dsa.h
index bf6a2ab..791fed6 100644 (file)
--- a/include/net/dsa.h
+++ b/include/net/dsa.h
@@ -404,7 +404,7 @@ struct dsa_switch_ops {
                                 const struct switchdev_obj_port_vlan *vlan);
        int     (*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);
 
        /*
         * Forwarding database
@@ -419,7 +419,7 @@ struct dsa_switch_ops {
                                const struct switchdev_obj_port_fdb *fdb);
        int     (*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);
 
        /*
         * Multicast database
@@ -434,7 +434,7 @@ struct dsa_switch_ops {
                                const struct switchdev_obj_port_mdb *mdb);
        int     (*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);
 
        /*
         * RXNFC