Commit 7e99e347 authored by Vivien Didelot's avatar Vivien Didelot Committed by Jakub Kicinski
Browse files

net: dsa: remove dsa_switch_alloc helper 



Now that ports are dynamically listed in the fabric, there is no need
to provide a special helper to allocate the dsa_switch structure. This
will give more flexibility to drivers to embed this structure as they
wish in their private structure.

Signed-off-by: default avatarVivien Didelot <vivien.didelot@gmail.com>
Reviewed-by: default avatarFlorian Fainelli <f.fainelli@gmail.com>
Signed-off-by: default avatarJakub Kicinski <jakub.kicinski@netronome.com>
parent 05f294a8

drivers/net/dsa/b53/b53_common.c

+4 −1
Original line number Diff line number Diff line
@@ -2341,10 +2341,13 @@ struct b53_device *b53_switch_alloc(struct device *base, 
	struct dsa_switch *ds;

	struct b53_device *dev;



	ds = dsa_switch_alloc(base, DSA_MAX_PORTS);

	ds = devm_kzalloc(base, sizeof(*ds), GFP_KERNEL);

	if (!ds)

		return NULL;



	ds->dev = base;

	ds->num_ports = DSA_MAX_PORTS;



	dev = devm_kzalloc(base, sizeof(*dev), GFP_KERNEL);

	if (!dev)

		return NULL;

drivers/net/dsa/dsa_loop.c

+4 −1
Original line number Diff line number Diff line
@@ -286,10 +286,13 @@ static int dsa_loop_drv_probe(struct mdio_device *mdiodev) 
	dev_info(&mdiodev->dev, "%s: 0x%0x\n",

		 pdata->name, pdata->enabled_ports);



	ds = dsa_switch_alloc(&mdiodev->dev, DSA_MAX_PORTS);

	ds = devm_kzalloc(&mdiodev->dev, sizeof(*ds), GFP_KERNEL);

	if (!ds)

		return -ENOMEM;



	ds->dev = &mdiodev->dev;

	ds->num_ports = DSA_MAX_PORTS;



	ps = devm_kzalloc(&mdiodev->dev, sizeof(*ps), GFP_KERNEL);

	if (!ps)

		return -ENOMEM;

drivers/net/dsa/lan9303-core.c

+3 −1
Original line number Diff line number Diff line
@@ -1283,10 +1283,12 @@ static int lan9303_register_switch(struct lan9303 *chip) 
{

	int base;



	chip->ds = dsa_switch_alloc(chip->dev, LAN9303_NUM_PORTS);

	chip->ds = devm_kzalloc(chip->dev, sizeof(*chip->ds), GFP_KERNEL);

	if (!chip->ds)

		return -ENOMEM;



	chip->ds->dev = chip->dev;

	chip->ds->num_ports = LAN9303_NUM_PORTS;

	chip->ds->priv = chip;

	chip->ds->ops = &lan9303_switch_ops;

	base = chip->phy_addr_base;

drivers/net/dsa/lantiq_gswip.c

+3 −1
Original line number Diff line number Diff line
@@ -1854,10 +1854,12 @@ static int gswip_probe(struct platform_device *pdev) 
	if (!priv->hw_info)

		return -EINVAL;



	priv->ds = dsa_switch_alloc(dev, priv->hw_info->max_ports);

	priv->ds = devm_kzalloc(dev, sizeof(*priv->ds), GFP_KERNEL);

	if (!priv->ds)

		return -ENOMEM;



	priv->ds->dev = dev;

	priv->ds->num_ports = priv->hw_info->max_ports;

	priv->ds->priv = priv;

	priv->ds->ops = &gswip_switch_ops;

	priv->dev = dev;

drivers/net/dsa/microchip/ksz_common.c

+4 −1
Original line number Diff line number Diff line
@@ -398,10 +398,13 @@ struct ksz_device *ksz_switch_alloc(struct device *base, void *priv) 
	struct dsa_switch *ds;

	struct ksz_device *swdev;



	ds = dsa_switch_alloc(base, DSA_MAX_PORTS);

	ds = devm_kzalloc(base, sizeof(*ds), GFP_KERNEL);

	if (!ds)

		return NULL;



	ds->dev = base;

	ds->num_ports = DSA_MAX_PORTS;



	swdev = devm_kzalloc(base, sizeof(*swdev), GFP_KERNEL);

	if (!swdev)

		return NULL;

CRA Git | Maintained and supported by SUSTech CRA and CCSE