Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

net: dsa: Rename DSA probe function. 



Rename the function called from the DSA to perform a probe for the
switch. This makes the normal _probe() name available for a standard
Linux device driver probe function.

Signed-off-by: default avatarAndrew Lunn <andrew@lunn.ch>
Tested-by: default avatarVivien Didelot <vivien.didelot@savoirfairelinux.com>
Acked-by: default avatarFlorian Fainelli <f.fainelli@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent a77d43f1

drivers/net/dsa/bcm_sf2.c

+4 −3
Original line number Diff line number Diff line
@@ -135,7 +135,8 @@ static int bcm_sf2_sw_get_sset_count(struct dsa_switch *ds) 
	return BCM_SF2_STATS_SIZE;

}



static char *bcm_sf2_sw_probe(struct device *dsa_dev, struct device *host_dev,

static char *bcm_sf2_sw_drv_probe(struct device *dsa_dev,

				  struct device *host_dev,

				  int sw_addr, void **_priv)

{

	struct bcm_sf2_priv *priv;
@@ -1370,7 +1371,7 @@ static int bcm_sf2_sw_set_wol(struct dsa_switch *ds, int port, 


static struct dsa_switch_driver bcm_sf2_switch_driver = {

	.tag_protocol		= DSA_TAG_PROTO_BRCM,

	.probe			= bcm_sf2_sw_probe,

	.probe			= bcm_sf2_sw_drv_probe,

	.setup			= bcm_sf2_sw_setup,

	.set_addr		= bcm_sf2_sw_set_addr,

	.get_phy_flags		= bcm_sf2_sw_get_phy_flags,

drivers/net/dsa/mv88e6060.c

+4 −3
Original line number Diff line number Diff line
@@ -69,7 +69,8 @@ static char *mv88e6060_get_name(struct mii_bus *bus, int sw_addr) 
	return NULL;

}



static char *mv88e6060_probe(struct device *dsa_dev, struct device *host_dev,

static char *mv88e6060_drv_probe(struct device *dsa_dev,

				 struct device *host_dev,

				 int sw_addr, void **_priv)

{

	struct mii_bus *bus = dsa_host_dev_to_mii_bus(host_dev);
@@ -248,7 +249,7 @@ mv88e6060_phy_write(struct dsa_switch *ds, int port, int regnum, u16 val) 


static struct dsa_switch_driver mv88e6060_switch_driver = {

	.tag_protocol	= DSA_TAG_PROTO_TRAILER,

	.probe		= mv88e6060_probe,

	.probe		= mv88e6060_drv_probe,

	.setup		= mv88e6060_setup,

	.set_addr	= mv88e6060_set_addr,

	.phy_read	= mv88e6060_phy_read,

drivers/net/dsa/mv88e6123.c

+4 −3
Original line number Diff line number Diff line
@@ -29,7 +29,8 @@ static const struct mv88e6xxx_switch_id mv88e6123_table[] = { 
	{ PORT_SWITCH_ID_6165_A2, "Marvell 88e6165 (A2)" },

};



static char *mv88e6123_probe(struct device *dsa_dev, struct device *host_dev,

static char *mv88e6123_drv_probe(struct device *dsa_dev,

				 struct device *host_dev,

				 int sw_addr, void **priv)

{

	return mv88e6xxx_drv_probe(dsa_dev, host_dev, sw_addr, priv,
@@ -106,7 +107,7 @@ static int mv88e6123_setup(struct dsa_switch *ds) 


struct dsa_switch_driver mv88e6123_switch_driver = {

	.tag_protocol		= DSA_TAG_PROTO_EDSA,

	.probe			= mv88e6123_probe,

	.probe			= mv88e6123_drv_probe,

	.setup			= mv88e6123_setup,

	.set_addr		= mv88e6xxx_set_addr_indirect,

	.phy_read		= mv88e6xxx_phy_read,

drivers/net/dsa/mv88e6131.c

+4 −3
Original line number Diff line number Diff line
@@ -25,7 +25,8 @@ static const struct mv88e6xxx_switch_id mv88e6131_table[] = { 
	{ PORT_SWITCH_ID_6185, "Marvell 88E6185" },

};



static char *mv88e6131_probe(struct device *dsa_dev, struct device *host_dev,

static char *mv88e6131_drv_probe(struct device *dsa_dev,

				 struct device *host_dev,

				 int sw_addr, void **priv)

{

	return mv88e6xxx_drv_probe(dsa_dev, host_dev, sw_addr, priv,
@@ -163,7 +164,7 @@ mv88e6131_phy_write(struct dsa_switch *ds, 


struct dsa_switch_driver mv88e6131_switch_driver = {

	.tag_protocol		= DSA_TAG_PROTO_DSA,

	.probe			= mv88e6131_probe,

	.probe			= mv88e6131_drv_probe,

	.setup			= mv88e6131_setup,

	.set_addr		= mv88e6xxx_set_addr_direct,

	.phy_read		= mv88e6131_phy_read,

drivers/net/dsa/mv88e6171.c

+4 −3
Original line number Diff line number Diff line
@@ -24,7 +24,8 @@ static const struct mv88e6xxx_switch_id mv88e6171_table[] = { 
	{ PORT_SWITCH_ID_6351, "Marvell 88E6351" },

};



static char *mv88e6171_probe(struct device *dsa_dev, struct device *host_dev,

static char *mv88e6171_drv_probe(struct device *dsa_dev,

				 struct device *host_dev,

				 int sw_addr, void **priv)

{

	return mv88e6xxx_drv_probe(dsa_dev, host_dev, sw_addr, priv,
@@ -92,7 +93,7 @@ static int mv88e6171_setup(struct dsa_switch *ds) 


struct dsa_switch_driver mv88e6171_switch_driver = {

	.tag_protocol		= DSA_TAG_PROTO_EDSA,

	.probe			= mv88e6171_probe,

	.probe			= mv88e6171_drv_probe,

	.setup			= mv88e6171_setup,

	.set_addr		= mv88e6xxx_set_addr_indirect,

	.phy_read		= mv88e6xxx_phy_read_indirect,