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

Commit 93e91b3d authored by Romain Perier's avatar Romain Perier Committed by David S. Miller
Browse files

ethernet: arc: mdio changes for future SoC glue layer devtree support 



This is an api changes for the emac_mdio.c module.
It will be required later when arc_emac_probe/arc_emac_remove
will no longer use 'struct platform_device'.

Signed-off-by: default avatarRomain Perier <romain.perier@gmail.com>
Reviewed-by: default avatarArnd Bergmann <arnd@arndb.de>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent f15f44e0

drivers/net/ethernet/arc/emac.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -204,7 +204,7 @@ static inline void arc_reg_clr(struct arc_emac_priv *priv, int reg, int mask) 
	arc_reg_set(priv, reg, value & ~mask);

	arc_reg_set(priv, reg, value & ~mask);

}

}





int arc_mdio_probe(struct platform_device *pdev, struct arc_emac_priv *priv);

int arc_mdio_probe(struct arc_emac_priv *priv);

int arc_mdio_remove(struct arc_emac_priv *priv);

int arc_mdio_remove(struct arc_emac_priv *priv);





#endif /* ARC_EMAC_H */
 
#endif /* ARC_EMAC_H */

drivers/net/ethernet/arc/emac_main.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -799,7 +799,7 @@ static int arc_emac_probe(struct platform_device *pdev) 
	dev_dbg(dev, "EMAC Device addr: Rx Ring [0x%x], Tx Ring[%x]\n",

	dev_dbg(dev, "EMAC Device addr: Rx Ring [0x%x], Tx Ring[%x]\n",

		(unsigned int)priv->rxbd_dma, (unsigned int)priv->txbd_dma);

		(unsigned int)priv->rxbd_dma, (unsigned int)priv->txbd_dma);





	err = arc_mdio_probe(pdev, priv);

	err = arc_mdio_probe(priv);

	if (err) {

	if (err) {

		dev_err(dev, "failed to probe MII bus\n");

		dev_err(dev, "failed to probe MII bus\n");

		goto out_clken;

		goto out_clken;

drivers/net/ethernet/arc/emac_mdio.c

+3 −4
Original line number Original line Diff line number Diff line
@@ -100,7 +100,6 @@ static int arc_mdio_write(struct mii_bus *bus, int phy_addr, 




/**

/**

 * arc_mdio_probe - MDIO probe function.

 * arc_mdio_probe - MDIO probe function.

 * @pdev:	Pointer to platform device.

 * @priv:	Pointer to ARC EMAC private data structure.

 * @priv:	Pointer to ARC EMAC private data structure.

 *

 *

 * returns:	0 on success, -ENOMEM when mdiobus_alloc

 * returns:	0 on success, -ENOMEM when mdiobus_alloc
@@ -108,7 +107,7 @@ static int arc_mdio_write(struct mii_bus *bus, int phy_addr, 
 *

 *

 * Sets up and registers the MDIO interface.

 * Sets up and registers the MDIO interface.

 */

 */

int arc_mdio_probe(struct platform_device *pdev, struct arc_emac_priv *priv)

int arc_mdio_probe(struct arc_emac_priv *priv)

{

{

	struct mii_bus *bus;

	struct mii_bus *bus;

	int error;

	int error;
@@ -124,9 +123,9 @@ int arc_mdio_probe(struct platform_device *pdev, struct arc_emac_priv *priv) 
	bus->read = &arc_mdio_read;

	bus->read = &arc_mdio_read;

	bus->write = &arc_mdio_write;

	bus->write = &arc_mdio_write;





	snprintf(bus->id, MII_BUS_ID_SIZE, "%s", pdev->name);

	snprintf(bus->id, MII_BUS_ID_SIZE, "%s", bus->name);





	error = of_mdiobus_register(bus, pdev->dev.of_node);

	error = of_mdiobus_register(bus, priv->dev->of_node);

	if (error) {

	if (error) {

		dev_err(priv->dev, "cannot register MDIO bus %s\n", bus->name);

		dev_err(priv->dev, "cannot register MDIO bus %s\n", bus->name);

		mdiobus_free(bus);

		mdiobus_free(bus);