Skip to content

Commit bbb31b7

Browse files
Russell King (Oracle)kuba-moo
authored andcommitted
net: dsa: remove mac_prepare()/mac_finish() shims
No DSA driver makes use of the mac_prepare()/mac_finish() shimmed operations anymore, so we can remove these. Signed-off-by: Russell King (Oracle) <rmk+kernel@armlinux.org.uk> Reviewed-by: Florian Fainelli <florian.fainelli@broadcom.com> Link: https://lore.kernel.org/r/E1sByNx-00ELW1-Vp@rmk-PC.armlinux.org.uk Signed-off-by: Jakub Kicinski <kuba@kernel.org>
1 parent eebe71d commit bbb31b7

File tree

3 files changed

+0
-40
lines changed

3 files changed

+0
-40
lines changed

include/net/dsa.h

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -882,15 +882,9 @@ struct dsa_switch_ops {
882882
struct phylink_pcs *(*phylink_mac_select_pcs)(struct dsa_switch *ds,
883883
int port,
884884
phy_interface_t iface);
885-
int (*phylink_mac_prepare)(struct dsa_switch *ds, int port,
886-
unsigned int mode,
887-
phy_interface_t interface);
888885
void (*phylink_mac_config)(struct dsa_switch *ds, int port,
889886
unsigned int mode,
890887
const struct phylink_link_state *state);
891-
int (*phylink_mac_finish)(struct dsa_switch *ds, int port,
892-
unsigned int mode,
893-
phy_interface_t interface);
894888
void (*phylink_mac_link_down)(struct dsa_switch *ds, int port,
895889
unsigned int mode,
896890
phy_interface_t interface);

net/dsa/dsa.c

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1507,9 +1507,7 @@ static int dsa_switch_probe(struct dsa_switch *ds)
15071507

15081508
if (ds->phylink_mac_ops) {
15091509
if (ds->ops->phylink_mac_select_pcs ||
1510-
ds->ops->phylink_mac_prepare ||
15111510
ds->ops->phylink_mac_config ||
1512-
ds->ops->phylink_mac_finish ||
15131511
ds->ops->phylink_mac_link_down ||
15141512
ds->ops->phylink_mac_link_up)
15151513
return -EINVAL;

net/dsa/port.c

Lines changed: 0 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -1549,21 +1549,6 @@ dsa_port_phylink_mac_select_pcs(struct phylink_config *config,
15491549
return pcs;
15501550
}
15511551

1552-
static int dsa_port_phylink_mac_prepare(struct phylink_config *config,
1553-
unsigned int mode,
1554-
phy_interface_t interface)
1555-
{
1556-
struct dsa_port *dp = dsa_phylink_to_port(config);
1557-
struct dsa_switch *ds = dp->ds;
1558-
int err = 0;
1559-
1560-
if (ds->ops->phylink_mac_prepare)
1561-
err = ds->ops->phylink_mac_prepare(ds, dp->index, mode,
1562-
interface);
1563-
1564-
return err;
1565-
}
1566-
15671552
static void dsa_port_phylink_mac_config(struct phylink_config *config,
15681553
unsigned int mode,
15691554
const struct phylink_link_state *state)
@@ -1577,21 +1562,6 @@ static void dsa_port_phylink_mac_config(struct phylink_config *config,
15771562
ds->ops->phylink_mac_config(ds, dp->index, mode, state);
15781563
}
15791564

1580-
static int dsa_port_phylink_mac_finish(struct phylink_config *config,
1581-
unsigned int mode,
1582-
phy_interface_t interface)
1583-
{
1584-
struct dsa_port *dp = dsa_phylink_to_port(config);
1585-
struct dsa_switch *ds = dp->ds;
1586-
int err = 0;
1587-
1588-
if (ds->ops->phylink_mac_finish)
1589-
err = ds->ops->phylink_mac_finish(ds, dp->index, mode,
1590-
interface);
1591-
1592-
return err;
1593-
}
1594-
15951565
static void dsa_port_phylink_mac_link_down(struct phylink_config *config,
15961566
unsigned int mode,
15971567
phy_interface_t interface)
@@ -1624,9 +1594,7 @@ static void dsa_port_phylink_mac_link_up(struct phylink_config *config,
16241594

16251595
static const struct phylink_mac_ops dsa_port_phylink_mac_ops = {
16261596
.mac_select_pcs = dsa_port_phylink_mac_select_pcs,
1627-
.mac_prepare = dsa_port_phylink_mac_prepare,
16281597
.mac_config = dsa_port_phylink_mac_config,
1629-
.mac_finish = dsa_port_phylink_mac_finish,
16301598
.mac_link_down = dsa_port_phylink_mac_link_down,
16311599
.mac_link_up = dsa_port_phylink_mac_link_up,
16321600
};

0 commit comments

Comments
 (0)