Commit 75104db0 authored by Andrew Lunn's avatar Andrew Lunn Committed by David S. Miller
Browse files

dsa: Remove phydev parameter from disable_port call 



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

Signed-off-by: default avatarAndrew Lunn <andrew@lunn.ch>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 0f3b1cf2

drivers/net/dsa/b53/b53_common.c

+2 −2
Original line number Diff line number Diff line
@@ -543,7 +543,7 @@ int b53_enable_port(struct dsa_switch *ds, int port, struct phy_device *phy) 
}

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;

	u8 reg;
@@ -963,7 +963,7 @@ static int b53_setup(struct dsa_switch *ds) 
		if (dsa_is_cpu_port(ds, port))

			b53_enable_cpu_port(dev, port);

		else if (dsa_is_unused_port(ds, port))

			b53_disable_port(ds, port, NULL);

			b53_disable_port(ds, port);

	}



	return ret;

drivers/net/dsa/b53/b53_priv.h

+1 −1
Original line number Diff line number Diff line
@@ -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,

		    struct dsa_mall_mirror_tc_entry *mirror);

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_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);

drivers/net/dsa/bcm_sf2.c

+4 −5
Original line number Diff line number Diff line
@@ -221,8 +221,7 @@ static int bcm_sf2_port_setup(struct dsa_switch *ds, int port, 
	return b53_enable_port(ds, port, phy);

}



static void bcm_sf2_port_disable(struct dsa_switch *ds, int port,

				 struct phy_device *phy)

static void bcm_sf2_port_disable(struct dsa_switch *ds, int port)

{

	struct bcm_sf2_priv *priv = bcm_sf2_to_priv(ds);

	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)

		bcm_sf2_gphy_enable_set(ds, false);



	b53_disable_port(ds, port, phy);

	b53_disable_port(ds, port);



	/* Power down the port memory */

	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++) {

		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;
@@ -788,7 +787,7 @@ static int bcm_sf2_sw_setup(struct dsa_switch *ds) 
		else if (dsa_is_cpu_port(ds, port))

			bcm_sf2_imp_setup(ds, port);

		else

			bcm_sf2_port_disable(ds, port, NULL);

			bcm_sf2_port_disable(ds, port);

	}



	b53_configure_vlan(ds);

drivers/net/dsa/lan9303-core.c

+1 −2
Original line number Diff line number Diff line
@@ -1091,8 +1091,7 @@ static int lan9303_port_enable(struct dsa_switch *ds, int port, 
	return lan9303_enable_processing_port(chip, port);

}



static void lan9303_port_disable(struct dsa_switch *ds, int port,

				 struct phy_device *phy)

static void lan9303_port_disable(struct dsa_switch *ds, int port)

{

	struct lan9303 *chip = ds->priv;

drivers/net/dsa/lantiq_gswip.c

+2 −3
Original line number Diff line number Diff line
@@ -480,8 +480,7 @@ static int gswip_port_enable(struct dsa_switch *ds, int port, 
	return 0;

}



static void gswip_port_disable(struct dsa_switch *ds, int port,

			       struct phy_device *phy)

static void gswip_port_disable(struct dsa_switch *ds, int port)

{

	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 */

	for (i = 0; i < priv->hw_info->max_ports; i++)

		gswip_port_disable(ds, i, NULL);

		gswip_port_disable(ds, i);



	/* enable Switch */

	gswip_mdio_mask(priv, 0, GSWIP_MDIO_GLOB_ENABLE, GSWIP_MDIO_GLOB);

CRA Git | Maintained and supported by SUSTech CRA and CCSE