leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

dsa: Remove phydev parameter from disable_port call

Browse Source 
No current DSA driver makes use of the phydev parameter passed to the
disable_port call. Remove it.

Signed-off-by: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Andrew Lunn 2019-02-24 20:44:43 +01:00 committed by David S. Miller
parent 0f3b1cf23f
commit 75104db0cb
16 changed files with 23 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/net/dsa/b53/b53_common.c
View File

@ -543,7 +543,7 @@ int b53_enable_port(struct dsa_switch *ds, int port, struct phy_device *phy)
} }
EXPORT_SYMBOL(b53_enable_port); EXPORT_SYMBOL(b53_enable_port);
void b53_disable_port(struct dsa_switch *ds, int port, struct phy_device *phy) void b53_disable_port(struct dsa_switch *ds, int port)
{ {
struct b53_device *dev = ds->priv; struct b53_device *dev = ds->priv;
u8 reg; u8 reg;
@ -963,7 +963,7 @@ static int b53_setup(struct dsa_switch *ds)
if (dsa_is_cpu_port(ds, port)) if (dsa_is_cpu_port(ds, port))
b53_enable_cpu_port(dev, port); b53_enable_cpu_port(dev, port);
else if (dsa_is_unused_port(ds, port)) else if (dsa_is_unused_port(ds, port))
b53_disable_port(ds, port, NULL); b53_disable_port(ds, port);
} }
return ret; return ret;

2
drivers/net/dsa/b53/b53_priv.h
View File

@ -356,7 +356,7 @@ enum dsa_tag_protocol b53_get_tag_protocol(struct dsa_switch *ds, int port);
void b53_mirror_del(struct dsa_switch *ds, int port, void b53_mirror_del(struct dsa_switch *ds, int port,
struct dsa_mall_mirror_tc_entry *mirror); struct dsa_mall_mirror_tc_entry *mirror);
int b53_enable_port(struct dsa_switch *ds, int port, struct phy_device *phy); int b53_enable_port(struct dsa_switch *ds, int port, struct phy_device *phy);
void b53_disable_port(struct dsa_switch *ds, int port, struct phy_device *phy); void b53_disable_port(struct dsa_switch *ds, int port);
void b53_brcm_hdr_setup(struct dsa_switch *ds, int port); void b53_brcm_hdr_setup(struct dsa_switch *ds, int port);
void b53_eee_enable_set(struct dsa_switch *ds, int port, bool enable); void b53_eee_enable_set(struct dsa_switch *ds, int port, bool enable);
int b53_eee_init(struct dsa_switch *ds, int port, struct phy_device *phy); int b53_eee_init(struct dsa_switch *ds, int port, struct phy_device *phy);

9
drivers/net/dsa/bcm_sf2.c
View File

@ -221,8 +221,7 @@ static int bcm_sf2_port_setup(struct dsa_switch *ds, int port,
return b53_enable_port(ds, port, phy); return b53_enable_port(ds, port, phy);
} }
static void bcm_sf2_port_disable(struct dsa_switch *ds, int port, static void bcm_sf2_port_disable(struct dsa_switch *ds, int port)
struct phy_device *phy)
{ {
struct bcm_sf2_priv *priv = bcm_sf2_to_priv(ds); struct bcm_sf2_priv *priv = bcm_sf2_to_priv(ds);
u32 reg; u32 reg;
@ -241,7 +240,7 @@ static void bcm_sf2_port_disable(struct dsa_switch *ds, int port,
if (priv->int_phy_mask & 1 << port && priv->hw_params.num_gphy == 1) if (priv->int_phy_mask & 1 << port && priv->hw_params.num_gphy == 1)
bcm_sf2_gphy_enable_set(ds, false); bcm_sf2_gphy_enable_set(ds, false);
b53_disable_port(ds, port, phy); b53_disable_port(ds, port);
/* Power down the port memory */ /* Power down the port memory */
reg = core_readl(priv, CORE_MEM_PSM_VDD_CTRL); reg = core_readl(priv, CORE_MEM_PSM_VDD_CTRL);
@ -692,7 +691,7 @@ static int bcm_sf2_sw_suspend(struct dsa_switch *ds)
*/ */
for (port = 0; port < ds->num_ports; port++) { for (port = 0; port < ds->num_ports; port++) {
if (dsa_is_user_port(ds, port) || dsa_is_cpu_port(ds, port)) if (dsa_is_user_port(ds, port) || dsa_is_cpu_port(ds, port))
bcm_sf2_port_disable(ds, port, NULL); bcm_sf2_port_disable(ds, port);
} }
return 0; return 0;
@ -788,7 +787,7 @@ static int bcm_sf2_sw_setup(struct dsa_switch *ds)
else if (dsa_is_cpu_port(ds, port)) else if (dsa_is_cpu_port(ds, port))
bcm_sf2_imp_setup(ds, port); bcm_sf2_imp_setup(ds, port);
else else
bcm_sf2_port_disable(ds, port, NULL); bcm_sf2_port_disable(ds, port);
} }
b53_configure_vlan(ds); b53_configure_vlan(ds);

3
drivers/net/dsa/lan9303-core.c
View File

@ -1091,8 +1091,7 @@ static int lan9303_port_enable(struct dsa_switch *ds, int port,
return lan9303_enable_processing_port(chip, port); return lan9303_enable_processing_port(chip, port);
} }
static void lan9303_port_disable(struct dsa_switch *ds, int port, static void lan9303_port_disable(struct dsa_switch *ds, int port)
struct phy_device *phy)
{ {
struct lan9303 *chip = ds->priv; struct lan9303 *chip = ds->priv;

5
drivers/net/dsa/lantiq_gswip.c
View File

@ -480,8 +480,7 @@ static int gswip_port_enable(struct dsa_switch *ds, int port,
return 0; return 0;
} }
static void gswip_port_disable(struct dsa_switch *ds, int port, static void gswip_port_disable(struct dsa_switch *ds, int port)
struct phy_device *phy)
{ {
struct gswip_priv *priv = ds->priv; struct gswip_priv *priv = ds->priv;
@ -549,7 +548,7 @@ static int gswip_setup(struct dsa_switch *ds)
/* disable port fetch/store dma on all ports */ /* disable port fetch/store dma on all ports */
for (i = 0; i < priv->hw_info->max_ports; i++) for (i = 0; i < priv->hw_info->max_ports; i++)
gswip_port_disable(ds, i, NULL); gswip_port_disable(ds, i);
/* enable Switch */ /* enable Switch */
gswip_mdio_mask(priv, 0, GSWIP_MDIO_GLOB_ENABLE, GSWIP_MDIO_GLOB); gswip_mdio_mask(priv, 0, GSWIP_MDIO_GLOB_ENABLE, GSWIP_MDIO_GLOB);

2
drivers/net/dsa/microchip/ksz_common.c
View File

@ -380,7 +380,7 @@ int ksz_enable_port(struct dsa_switch *ds, int port, struct phy_device *phy)
} }
EXPORT_SYMBOL_GPL(ksz_enable_port); EXPORT_SYMBOL_GPL(ksz_enable_port);
void ksz_disable_port(struct dsa_switch *ds, int port, struct phy_device *phy) void ksz_disable_port(struct dsa_switch *ds, int port)
{ {
struct ksz_device *dev = ds->priv; struct ksz_device *dev = ds->priv;

2
drivers/net/dsa/microchip/ksz_common.h
View File

@ -35,7 +35,7 @@ void ksz_port_mdb_add(struct dsa_switch *ds, int port,
int ksz_port_mdb_del(struct dsa_switch *ds, int port, int ksz_port_mdb_del(struct dsa_switch *ds, int port,
const struct switchdev_obj_port_mdb *mdb); const struct switchdev_obj_port_mdb *mdb);
int ksz_enable_port(struct dsa_switch *ds, int port, struct phy_device *phy); int ksz_enable_port(struct dsa_switch *ds, int port, struct phy_device *phy);
void ksz_disable_port(struct dsa_switch *ds, int port, struct phy_device *phy); void ksz_disable_port(struct dsa_switch *ds, int port);
/* Common register access functions */ /* Common register access functions */

5
drivers/net/dsa/mt7530.c
View File

@ -729,8 +729,7 @@ mt7530_port_enable(struct dsa_switch *ds, int port,
} }
static void static void
mt7530_port_disable(struct dsa_switch *ds, int port, mt7530_port_disable(struct dsa_switch *ds, int port)
struct phy_device *phy)
{ {
struct mt7530_priv *priv = ds->priv; struct mt7530_priv *priv = ds->priv;
@ -1301,7 +1300,7 @@ mt7530_setup(struct dsa_switch *ds)
if (dsa_is_cpu_port(ds, i)) if (dsa_is_cpu_port(ds, i))
mt7530_cpu_port_enable(priv, i); mt7530_cpu_port_enable(priv, i);
else else
mt7530_port_disable(ds, i, NULL); mt7530_port_disable(ds, i);
} }
/* Flush the FDB table */ /* Flush the FDB table */

3
drivers/net/dsa/mv88e6xxx/chip.c
View File

@ -2388,8 +2388,7 @@ static int mv88e6xxx_port_enable(struct dsa_switch *ds, int port,
return err; return err;
} }
static void mv88e6xxx_port_disable(struct dsa_switch *ds, int port, static void mv88e6xxx_port_disable(struct dsa_switch *ds, int port)
struct phy_device *phydev)
{ {
struct mv88e6xxx_chip *chip = ds->priv; struct mv88e6xxx_chip *chip = ds->priv;

3
drivers/net/dsa/qca8k.c
View File

@ -801,8 +801,7 @@ qca8k_port_enable(struct dsa_switch *ds, int port,
} }
static void static void
qca8k_port_disable(struct dsa_switch *ds, int port, qca8k_port_disable(struct dsa_switch *ds, int port)
struct phy_device *phy)
{ {
struct qca8k_priv *priv = (struct qca8k_priv *)ds->priv; struct qca8k_priv *priv = (struct qca8k_priv *)ds->priv;

3
drivers/net/dsa/rtl8366rb.c
View File

@ -1073,8 +1073,7 @@ rtl8366rb_port_enable(struct dsa_switch *ds, int port,
} }
static void static void
rtl8366rb_port_disable(struct dsa_switch *ds, int port, rtl8366rb_port_disable(struct dsa_switch *ds, int port)
struct phy_device *phy)
{ {
struct realtek_smi *smi = ds->priv; struct realtek_smi *smi = ds->priv;
int ret; int ret;

3
drivers/net/dsa/vitesse-vsc73xx.c
View File

@ -1013,8 +1013,7 @@ static int vsc73xx_port_enable(struct dsa_switch *ds, int port,
return 0; return 0;
} }
static void vsc73xx_port_disable(struct dsa_switch *ds, int port, static void vsc73xx_port_disable(struct dsa_switch *ds, int port)
struct phy_device *phy)
{ {
struct vsc73xx *vsc = ds->priv; struct vsc73xx *vsc = ds->priv;

3
include/net/dsa.h
View File

@ -364,8 +364,7 @@ struct dsa_switch_ops {
*/ */
int (*port_enable)(struct dsa_switch *ds, int port, int (*port_enable)(struct dsa_switch *ds, int port,
struct phy_device *phy); struct phy_device *phy);
void (*port_disable)(struct dsa_switch *ds, int port, void (*port_disable)(struct dsa_switch *ds, int port);
struct phy_device *phy);
/* /*
* Port's MAC EEE settings * Port's MAC EEE settings

2
net/dsa/dsa_priv.h
View File

@ -143,7 +143,7 @@ static inline struct net_device *dsa_master_find_slave(struct net_device *dev,
int dsa_port_set_state(struct dsa_port *dp, u8 state, int dsa_port_set_state(struct dsa_port *dp, u8 state,
struct switchdev_trans *trans); struct switchdev_trans *trans);
int dsa_port_enable(struct dsa_port *dp, struct phy_device *phy); int dsa_port_enable(struct dsa_port *dp, struct phy_device *phy);
void dsa_port_disable(struct dsa_port *dp, struct phy_device *phy); void dsa_port_disable(struct dsa_port *dp);
int dsa_port_bridge_join(struct dsa_port *dp, struct net_device *br); int dsa_port_bridge_join(struct dsa_port *dp, struct net_device *br);
void dsa_port_bridge_leave(struct dsa_port *dp, struct net_device *br); void dsa_port_bridge_leave(struct dsa_port *dp, struct net_device *br);
int dsa_port_vlan_filtering(struct dsa_port *dp, bool vlan_filtering, int dsa_port_vlan_filtering(struct dsa_port *dp, bool vlan_filtering,

4
net/dsa/port.c
View File

@ -85,7 +85,7 @@ int dsa_port_enable(struct dsa_port *dp, struct phy_device *phy)
return 0; return 0;
} }
void dsa_port_disable(struct dsa_port *dp, struct phy_device *phy) void dsa_port_disable(struct dsa_port *dp)
{ {
struct dsa_switch *ds = dp->ds; struct dsa_switch *ds = dp->ds;
int port = dp->index; int port = dp->index;
@ -94,7 +94,7 @@ void dsa_port_disable(struct dsa_port *dp, struct phy_device *phy)
dsa_port_set_state_now(dp, BR_STATE_DISABLED); dsa_port_set_state_now(dp, BR_STATE_DISABLED);
if (ds->ops->port_disable) if (ds->ops->port_disable)
ds->ops->port_disable(ds, port, phy); ds->ops->port_disable(ds, port);
} }
int dsa_port_bridge_join(struct dsa_port *dp, struct net_device *br) int dsa_port_bridge_join(struct dsa_port *dp, struct net_device *br)

2
net/dsa/slave.c
View File

@ -122,7 +122,7 @@ static int dsa_slave_close(struct net_device *dev)
phylink_stop(dp->pl); phylink_stop(dp->pl);
dsa_port_disable(dp, dev->phydev); dsa_port_disable(dp);
dev_mc_unsync(master, dev); dev_mc_unsync(master, dev);
dev_uc_unsync(master, dev); dev_uc_unsync(master, dev);