net: dsa: Have the switch driver allocate there own private memory

Now the switch devices have a dev pointer, make use of it for allocating
the drivers private data structures using a devm_kzalloc().

Signed-off-by: Andrew Lunn <andrew@lunn.ch>
Acked-by: Florian Fainelli <f.fainelli@gmail.com>
Tested-by: Vivien Didelot <vivien.didelot@savoirfairelinux.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 14 insertions, 3 deletions

diff --git a/drivers/net/dsa/mv88e6171.c b/drivers/net/dsa/mv88e6171.c
index fb35d3ac1644..15200928cecc 100644
--- a/drivers/net/dsa/mv88e6171.c
+++ b/drivers/net/dsa/mv88e6171.c
@@ -25,10 +25,20 @@ static const struct mv88e6xxx_switch_id mv88e6171_table[] = {
 };
 
 static char *mv88e6171_probe(struct device *dsa_dev, struct device *host_dev,
-                             int sw_addr)
+                             int sw_addr, void **priv)
 {
-        return mv88e6xxx_lookup_name(host_dev, sw_addr, mv88e6171_table,
+        struct mv88e6xxx_priv_state *ps;
+        char *name;
+
+        name = mv88e6xxx_lookup_name(host_dev, sw_addr, mv88e6171_table,
                                      ARRAY_SIZE(mv88e6171_table));
+                if (name) {
+                ps = devm_kzalloc(dsa_dev, sizeof(*ps), GFP_KERNEL);
+                if (!ps)
+                        return NULL;
+                *priv = ps;
+        }
+        return name;
 }
 
 static int mv88e6171_setup_global(struct dsa_switch *ds)
@@ -70,6 +80,8 @@ static int mv88e6171_setup(struct dsa_switch *ds)
         struct mv88e6xxx_priv_state *ps = ds_to_priv(ds);
         int ret;
 
+        ps->ds = ds;
+
         ret = mv88e6xxx_setup_common(ds);
         if (ret < 0)
                 return ret;
@@ -89,7 +101,6 @@ static int mv88e6171_setup(struct dsa_switch *ds)
 
 struct dsa_switch_driver mv88e6171_switch_driver = {
         .tag_protocol           = DSA_TAG_PROTO_EDSA,
-        .priv_size              = sizeof(struct mv88e6xxx_priv_state),
         .probe                  = mv88e6171_probe,
         .setup                  = mv88e6171_setup,
         .set_addr               = mv88e6xxx_set_addr_indirect,