lkml.org 
[lkml]   [2017]   [Jan]   [14]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH net-next v3 01/10] net: dsa: Pass device pointer to dsa_register_switch
    Date
    In preparation for allowing dsa_register_switch() to be supplied with
    device/platform data, pass down a struct device pointer instead of a
    struct device_node.

    Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
    ---
    drivers/net/dsa/b53/b53_common.c | 2 +-
    drivers/net/dsa/mv88e6xxx/chip.c | 11 ++++++-----
    drivers/net/dsa/qca8k.c | 2 +-
    include/net/dsa.h | 2 +-
    net/dsa/dsa2.c | 7 ++++---
    5 files changed, 13 insertions(+), 11 deletions(-)

    diff --git a/drivers/net/dsa/b53/b53_common.c b/drivers/net/dsa/b53/b53_common.c
    index 5102a3701a1a..7179eed9ee6d 100644
    --- a/drivers/net/dsa/b53/b53_common.c
    +++ b/drivers/net/dsa/b53/b53_common.c
    @@ -1882,7 +1882,7 @@ int b53_switch_register(struct b53_device *dev)

    pr_info("found switch: %s, rev %i\n", dev->name, dev->core_rev);

    - return dsa_register_switch(dev->ds, dev->ds->dev->of_node);
    + return dsa_register_switch(dev->ds, dev->ds->dev);
    }
    EXPORT_SYMBOL(b53_switch_register);

    diff --git a/drivers/net/dsa/mv88e6xxx/chip.c b/drivers/net/dsa/mv88e6xxx/chip.c
    index 987b2dbbd35a..3238a4752b98 100644
    --- a/drivers/net/dsa/mv88e6xxx/chip.c
    +++ b/drivers/net/dsa/mv88e6xxx/chip.c
    @@ -4421,8 +4421,7 @@ static struct dsa_switch_driver mv88e6xxx_switch_drv = {
    .ops = &mv88e6xxx_switch_ops,
    };

    -static int mv88e6xxx_register_switch(struct mv88e6xxx_chip *chip,
    - struct device_node *np)
    +static int mv88e6xxx_register_switch(struct mv88e6xxx_chip *chip)
    {
    struct device *dev = chip->dev;
    struct dsa_switch *ds;
    @@ -4437,7 +4436,7 @@ static int mv88e6xxx_register_switch(struct mv88e6xxx_chip *chip,

    dev_set_drvdata(dev, ds);

    - return dsa_register_switch(ds, np);
    + return dsa_register_switch(ds, dev);
    }

    static void mv88e6xxx_unregister_switch(struct mv88e6xxx_chip *chip)
    @@ -4521,9 +4520,11 @@ static int mv88e6xxx_probe(struct mdio_device *mdiodev)
    if (err)
    goto out_g2_irq;

    - err = mv88e6xxx_register_switch(chip, np);
    - if (err)
    + err = mv88e6xxx_register_switch(chip);
    + if (err) {
    + mv88e6xxx_mdio_unregister(chip);
    goto out_mdio;
    + }

    return 0;

    diff --git a/drivers/net/dsa/qca8k.c b/drivers/net/dsa/qca8k.c
    index 54d270d59eb0..c084aa484d2b 100644
    --- a/drivers/net/dsa/qca8k.c
    +++ b/drivers/net/dsa/qca8k.c
    @@ -964,7 +964,7 @@ qca8k_sw_probe(struct mdio_device *mdiodev)
    mutex_init(&priv->reg_mutex);
    dev_set_drvdata(&mdiodev->dev, priv);

    - return dsa_register_switch(priv->ds, priv->ds->dev->of_node);
    + return dsa_register_switch(priv->ds, &mdiodev->dev);
    }

    static void
    diff --git a/include/net/dsa.h b/include/net/dsa.h
    index b94d1f2ef912..16a502a6c26a 100644
    --- a/include/net/dsa.h
    +++ b/include/net/dsa.h
    @@ -403,7 +403,7 @@ static inline bool dsa_uses_tagged_protocol(struct dsa_switch_tree *dst)
    }

    void dsa_unregister_switch(struct dsa_switch *ds);
    -int dsa_register_switch(struct dsa_switch *ds, struct device_node *np);
    +int dsa_register_switch(struct dsa_switch *ds, struct device *dev);
    #ifdef CONFIG_PM_SLEEP
    int dsa_switch_suspend(struct dsa_switch *ds);
    int dsa_switch_resume(struct dsa_switch *ds);
    diff --git a/net/dsa/dsa2.c b/net/dsa/dsa2.c
    index 42a41d84053c..4170f7ea8e28 100644
    --- a/net/dsa/dsa2.c
    +++ b/net/dsa/dsa2.c
    @@ -579,8 +579,9 @@ static struct device_node *dsa_get_ports(struct dsa_switch *ds,
    return ports;
    }

    -static int _dsa_register_switch(struct dsa_switch *ds, struct device_node *np)
    +static int _dsa_register_switch(struct dsa_switch *ds, struct device *dev)
    {
    + struct device_node *np = dev->of_node;
    struct device_node *ports = dsa_get_ports(ds, np);
    struct dsa_switch_tree *dst;
    u32 tree, index;
    @@ -660,12 +661,12 @@ static int _dsa_register_switch(struct dsa_switch *ds, struct device_node *np)
    return err;
    }

    -int dsa_register_switch(struct dsa_switch *ds, struct device_node *np)
    +int dsa_register_switch(struct dsa_switch *ds, struct device *dev)
    {
    int err;

    mutex_lock(&dsa2_mutex);
    - err = _dsa_register_switch(ds, np);
    + err = _dsa_register_switch(ds, dev);
    mutex_unlock(&dsa2_mutex);

    return err;
    --
    2.9.3
    \
     
     \ /
      Last update: 2017-01-14 22:50    [W:2.873 / U:0.060 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site