Commit c4a1cefd authored by Vladimir Oltean's avatar Vladimir Oltean Committed by David S. Miller
Browse files

net: dsa: qca8k: use "dev" consistently within qca8k_mdio_register() 



Accessed either through priv->dev or ds->dev, it is the same device
structure. Keep a single variable which holds a reference to it, and use
it consistently.

Signed-off-by: default avatarVladimir Oltean <vladimir.oltean@nxp.com>
Reviewed-by: default avatarAlvin Šipraga <alsi@bang-olufsen.dk>
Reviewed-by: default avatarFlorian Fainelli <florian.fainelli@broadcom.com>
Reviewed-by: default avatarChristian Marangi <ansuelsmth@gmail.com>
Reviewed-by: default avatarLuiz Angelo Daros de Luca <luizluca@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 5c5d6b34

drivers/net/dsa/qca/qca8k-8xxx.c

+5 −4
Original line number Diff line number Diff line
@@ -947,15 +947,16 @@ static int 
qca8k_mdio_register(struct qca8k_priv *priv)

{

	struct dsa_switch *ds = priv->ds;

	struct device *dev = ds->dev;

	struct device_node *mdio;

	struct mii_bus *bus;

	int err = 0;



	mdio = of_get_child_by_name(priv->dev->of_node, "mdio");

	mdio = of_get_child_by_name(dev->of_node, "mdio");

	if (mdio && !of_device_is_available(mdio))

		goto out;



	bus = devm_mdiobus_alloc(ds->dev);

	bus = devm_mdiobus_alloc(dev);

	if (!bus) {

		err = -ENOMEM;

		goto out_put_node;
@@ -965,7 +966,7 @@ qca8k_mdio_register(struct qca8k_priv *priv) 
	bus->priv = (void *)priv;

	snprintf(bus->id, MII_BUS_ID_SIZE, "qca8k-%d.%d",

		 ds->dst->index, ds->index);

	bus->parent = ds->dev;

	bus->parent = dev;



	if (mdio) {

		/* Check if the device tree declares the port:phy mapping */
@@ -983,7 +984,7 @@ qca8k_mdio_register(struct qca8k_priv *priv) 
		bus->write = qca8k_legacy_mdio_write;

	}



	err = devm_of_mdiobus_register(priv->dev, bus, mdio);

	err = devm_of_mdiobus_register(dev, bus, mdio);



out_put_node:

	of_node_put(mdio);