net: dsa: b53: Initialize ds->ops in b53_switch_alloc
authorFlorian Fainelli <f.fainelli@gmail.com>
Fri, 26 Aug 2016 19:18:29 +0000 (12:18 -0700)
committerDavid S. Miller <davem@davemloft.net>
Fri, 26 Aug 2016 20:15:47 +0000 (13:15 -0700)
In order to allow drivers to override specific dsa_switch_driver
callbacks, initialize ds->ops to b53_switch_ops earlier, which avoids
having to expose this structure to glue drivers.

Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/dsa/b53/b53_common.c

index 6fb77cc..9fc7265 100644 (file)
@@ -1602,7 +1602,6 @@ static const struct b53_chip_data b53_switch_chips[] = {
 
 static int b53_switch_init(struct b53_device *dev)
 {
-       struct dsa_switch *ds = dev->ds;
        unsigned int i;
        int ret;
 
@@ -1618,7 +1617,6 @@ static int b53_switch_init(struct b53_device *dev)
                        dev->vta_regs[1] = chip->vta_regs[1];
                        dev->vta_regs[2] = chip->vta_regs[2];
                        dev->jumbo_pm_reg = chip->jumbo_pm_reg;
-                       ds->ops = &b53_switch_ops;
                        dev->cpu_port = chip->cpu_port;
                        dev->num_vlans = chip->vlans;
                        dev->num_arl_entries = chip->arl_entries;
@@ -1706,6 +1704,7 @@ struct b53_device *b53_switch_alloc(struct device *base,
        dev->ds = ds;
        dev->priv = priv;
        dev->ops = ops;
+       ds->ops = &b53_switch_ops;
        mutex_init(&dev->reg_mutex);
        mutex_init(&dev->stats_mutex);