lkml.org 
[lkml]   [2022]   [Apr]   [15]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[net-next PATCH v3 4/6] net: dsa: qca8k: drop dsa_switch_ops from qca8k_priv
    Date
    Now that dsa_switch_ops is not switch specific anymore, we can drop it
    from qca8k_priv and use the static ops directly for the dsa_switch
    pointer.

    Signed-off-by: Ansuel Smith <ansuelsmth@gmail.com>
    Reviewed-by: Vladimir Oltean <olteanv@gmail.com>
    ---
    drivers/net/dsa/qca8k.c | 3 +--
    drivers/net/dsa/qca8k.h | 1 -
    2 files changed, 1 insertion(+), 3 deletions(-)

    diff --git a/drivers/net/dsa/qca8k.c b/drivers/net/dsa/qca8k.c
    index 24d57083ee2c..ef8d686de609 100644
    --- a/drivers/net/dsa/qca8k.c
    +++ b/drivers/net/dsa/qca8k.c
    @@ -3157,8 +3157,7 @@ qca8k_sw_probe(struct mdio_device *mdiodev)
    priv->ds->dev = &mdiodev->dev;
    priv->ds->num_ports = QCA8K_NUM_PORTS;
    priv->ds->priv = priv;
    - priv->ops = qca8k_switch_ops;
    - priv->ds->ops = &priv->ops;
    + priv->ds->ops = &qca8k_switch_ops;
    mutex_init(&priv->reg_mutex);
    dev_set_drvdata(&mdiodev->dev, priv);

    diff --git a/drivers/net/dsa/qca8k.h b/drivers/net/dsa/qca8k.h
    index 8bbe36f135b5..04408e11402a 100644
    --- a/drivers/net/dsa/qca8k.h
    +++ b/drivers/net/dsa/qca8k.h
    @@ -394,7 +394,6 @@ struct qca8k_priv {
    struct dsa_switch *ds;
    struct mutex reg_mutex;
    struct device *dev;
    - struct dsa_switch_ops ops;
    struct gpio_desc *reset_gpio;
    struct net_device *mgmt_master; /* Track if mdio/mib Ethernet is available */
    struct qca8k_mgmt_eth_data mgmt_eth_data;
    --
    2.34.1
    \
     
     \ /
      Last update: 2022-04-16 01:31    [W:4.242 / U:0.024 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site