From: Alvin Šipraga <a...@bang-olufsen.dk> Now that neither interface driver requires .phy_read or .phy_write, the ops are the same and some code can be deleted. No functional change.
Signed-off-by: Alvin Šipraga <a...@bang-olufsen.dk> --- drivers/net/realtek-dsa/realtek-mdio.c | 2 +- drivers/net/realtek-dsa/realtek-smi.c | 2 +- drivers/net/realtek-dsa/realtek.h | 3 +-- drivers/net/realtek-dsa/rtl8365mb.c | 11 ++--------- drivers/net/realtek-dsa/rtl8366rb.c | 10 ++-------- 5 files changed, 7 insertions(+), 21 deletions(-) diff --git a/drivers/net/realtek-dsa/realtek-mdio.c b/drivers/net/realtek-dsa/realtek-mdio.c index 2b8661b95677..4fc2295b1b5f 100644 --- a/drivers/net/realtek-dsa/realtek-mdio.c +++ b/drivers/net/realtek-dsa/realtek-mdio.c @@ -236,7 +236,7 @@ static int realtek_mdio_probe(struct phy_device *mdiodev) priv->ds->dev = dev; priv->ds->num_ports = priv->num_ports; priv->ds->priv = priv; - priv->ds->ops = var->ds_ops_mdio; + priv->ds->ops = var->ds_ops; ret = realtek_dsa_init_tagger(priv); if (ret) diff --git a/drivers/net/realtek-dsa/realtek-smi.c b/drivers/net/realtek-dsa/realtek-smi.c index f93024ace516..da150dbc5d8b 100644 --- a/drivers/net/realtek-dsa/realtek-smi.c +++ b/drivers/net/realtek-dsa/realtek-smi.c @@ -450,7 +450,7 @@ static int realtek_smi_probe(struct device *dev) priv->ds->dev = dev; priv->ds->num_ports = priv->num_ports; priv->ds->priv = priv; - priv->ds->ops = var->ds_ops_smi; + priv->ds->ops = var->ds_ops; ret = realtek_dsa_init_tagger(priv); if (ret) diff --git a/drivers/net/realtek-dsa/realtek.h b/drivers/net/realtek-dsa/realtek.h index ac84b18cdd14..dbca9494627a 100644 --- a/drivers/net/realtek-dsa/realtek.h +++ b/drivers/net/realtek-dsa/realtek.h @@ -69,8 +69,7 @@ struct realtek_ops { }; struct realtek_variant { - const struct dsa_switch_ops *ds_ops_smi; - const struct dsa_switch_ops *ds_ops_mdio; + const struct dsa_switch_ops *ds_ops; const struct realtek_ops *ops; unsigned int clk_delay; u8 cmd_read; diff --git a/drivers/net/realtek-dsa/rtl8365mb.c b/drivers/net/realtek-dsa/rtl8365mb.c index 0f4c471715d1..588998235827 100644 --- a/drivers/net/realtek-dsa/rtl8365mb.c +++ b/drivers/net/realtek-dsa/rtl8365mb.c @@ -1225,13 +1225,7 @@ static int rtl8365mb_detect(struct realtek_priv *priv) return 0; } -static const struct dsa_switch_ops rtl8365mb_switch_ops_smi = { - .port_pre_enable = rtl8365mb_phylink_mac_config, - .port_disable = rtl8365mb_phylink_mac_link_down, - .port_enable = rtl8365mb_phylink_mac_link_up, -}; - -static const struct dsa_switch_ops rtl8365mb_switch_ops_mdio = { +static const struct dsa_switch_ops rtl8365mb_switch_ops = { .port_pre_enable = rtl8365mb_phylink_mac_config, .port_disable = rtl8365mb_phylink_mac_link_down, .port_enable = rtl8365mb_phylink_mac_link_up, @@ -1247,8 +1241,7 @@ static const struct realtek_ops rtl8365mb_ops = { }; const struct realtek_variant rtl8365mb_variant = { - .ds_ops_smi = &rtl8365mb_switch_ops_smi, - .ds_ops_mdio = &rtl8365mb_switch_ops_mdio, + .ds_ops = &rtl8365mb_switch_ops, .ops = &rtl8365mb_ops, .clk_delay = 10, .cmd_read = 0xb9, diff --git a/drivers/net/realtek-dsa/rtl8366rb.c b/drivers/net/realtek-dsa/rtl8366rb.c index 6fd2b1852159..35028d319ecd 100644 --- a/drivers/net/realtek-dsa/rtl8366rb.c +++ b/drivers/net/realtek-dsa/rtl8366rb.c @@ -1079,12 +1079,7 @@ static int rtl8366rb_detect(struct realtek_priv *priv) return rtl8366rb_reset_chip(priv); } -static const struct dsa_switch_ops rtl8366rb_switch_ops_smi = { - .port_enable = rtl8366rb_port_enable, - .port_disable = rtl8366rb_port_disable, -}; - -static const struct dsa_switch_ops rtl8366rb_switch_ops_mdio = { +static const struct dsa_switch_ops rtl8366rb_switch_ops = { .port_enable = rtl8366rb_port_enable, .port_disable = rtl8366rb_port_disable, }; @@ -1098,8 +1093,7 @@ static const struct realtek_ops rtl8366rb_ops = { }; const struct realtek_variant rtl8366rb_variant = { - .ds_ops_smi = &rtl8366rb_switch_ops_smi, - .ds_ops_mdio = &rtl8366rb_switch_ops_mdio, + .ds_ops = &rtl8366rb_switch_ops, .ops = &rtl8366rb_ops, .clk_delay = 10, .cmd_read = 0xa9, -- 2.43.0