Commit 65aa371e authored by Sean Anderson's avatar Sean Anderson Committed by David S. Miller
Browse files

net: Convert more users of mdiobus_* to mdiodev_* 



This converts users of mdiobus to mdiodev using the following semantic
patch:

@@
identifier mdiodev;
expression regnum;
@@

- mdiobus_read(mdiodev->bus, mdiodev->addr, regnum)
+ mdiodev_read(mdiodev, regnum)

@@
identifier mdiodev;
expression regnum, val;
@@

- mdiobus_write(mdiodev->bus, mdiodev->addr, regnum, val)
+ mdiodev_write(mdiodev, regnum, val)

Signed-off-by: default avatarSean Anderson <sean.anderson@seco.com>
Reviewed-by: default avatarFlorian Fainelli <f.fainelli@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent c8fb89a7

drivers/base/regmap/regmap-mdio.c

+3 −3
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ static int regmap_mdio_read(struct mdio_device *mdio_dev, u32 reg, unsigned int 
{

	int ret;



	ret = mdiobus_read(mdio_dev->bus, mdio_dev->addr, reg);

	ret = mdiodev_read(mdio_dev, reg);

	if (ret < 0)

		return ret;
@@ -24,7 +24,7 @@ static int regmap_mdio_read(struct mdio_device *mdio_dev, u32 reg, unsigned int 


static int regmap_mdio_write(struct mdio_device *mdio_dev, u32 reg, unsigned int val)

{

	return mdiobus_write(mdio_dev->bus, mdio_dev->addr, reg, val);

	return mdiodev_write(mdio_dev, reg, val);

}



static int regmap_mdio_c22_read(void *context, unsigned int reg, unsigned int *val)
@@ -44,7 +44,7 @@ static int regmap_mdio_c22_write(void *context, unsigned int reg, unsigned int v 
	if (unlikely(reg & ~REGNUM_C22_MASK))

		return -ENXIO;



	return mdiobus_write(mdio_dev->bus, mdio_dev->addr, reg, val);

	return mdiodev_write(mdio_dev, reg, val);

}



static const struct regmap_bus regmap_mdio_c22_bus = {

drivers/net/dsa/xrs700x/xrs700x_mdio.c

+6 −6
Original line number Diff line number Diff line
@@ -31,7 +31,7 @@ static int xrs700x_mdio_reg_read(void *context, unsigned int reg, 


	uval = (u16)FIELD_GET(GENMASK(31, 16), reg);



	ret = mdiobus_write(mdiodev->bus, mdiodev->addr, XRS_MDIO_IBA1, uval);

	ret = mdiodev_write(mdiodev, XRS_MDIO_IBA1, uval);

	if (ret < 0) {

		dev_err(dev, "xrs mdiobus_write returned %d\n", ret);

		return ret;
@@ -39,13 +39,13 @@ static int xrs700x_mdio_reg_read(void *context, unsigned int reg, 


	uval = (u16)((reg & GENMASK(15, 1)) | XRS_IB_READ);



	ret = mdiobus_write(mdiodev->bus, mdiodev->addr, XRS_MDIO_IBA0, uval);

	ret = mdiodev_write(mdiodev, XRS_MDIO_IBA0, uval);

	if (ret < 0) {

		dev_err(dev, "xrs mdiobus_write returned %d\n", ret);

		return ret;

	}



	ret = mdiobus_read(mdiodev->bus, mdiodev->addr, XRS_MDIO_IBD);

	ret = mdiodev_read(mdiodev, XRS_MDIO_IBD);

	if (ret < 0) {

		dev_err(dev, "xrs mdiobus_read returned %d\n", ret);

		return ret;
@@ -64,7 +64,7 @@ static int xrs700x_mdio_reg_write(void *context, unsigned int reg, 
	u16 uval;

	int ret;



	ret = mdiobus_write(mdiodev->bus, mdiodev->addr, XRS_MDIO_IBD, (u16)val);

	ret = mdiodev_write(mdiodev, XRS_MDIO_IBD, (u16)val);

	if (ret < 0) {

		dev_err(dev, "xrs mdiobus_write returned %d\n", ret);

		return ret;
@@ -72,7 +72,7 @@ static int xrs700x_mdio_reg_write(void *context, unsigned int reg, 


	uval = (u16)FIELD_GET(GENMASK(31, 16), reg);



	ret = mdiobus_write(mdiodev->bus, mdiodev->addr, XRS_MDIO_IBA1, uval);

	ret = mdiodev_write(mdiodev, XRS_MDIO_IBA1, uval);

	if (ret < 0) {

		dev_err(dev, "xrs mdiobus_write returned %d\n", ret);

		return ret;
@@ -80,7 +80,7 @@ static int xrs700x_mdio_reg_write(void *context, unsigned int reg, 


	uval = (u16)((reg & GENMASK(15, 1)) | XRS_IB_WRITE);



	ret = mdiobus_write(mdiodev->bus, mdiodev->addr, XRS_MDIO_IBA0, uval);

	ret = mdiodev_write(mdiodev, XRS_MDIO_IBA0, uval);

	if (ret < 0) {

		dev_err(dev, "xrs mdiobus_write returned %d\n", ret);

		return ret;

drivers/phy/broadcom/phy-bcm-ns-usb3.c

+1 −1
Original line number Diff line number Diff line
@@ -183,7 +183,7 @@ static int bcm_ns_usb3_mdio_phy_write(struct bcm_ns_usb3 *usb3, u16 reg, 
{

	struct mdio_device *mdiodev = usb3->mdiodev;



	return mdiobus_write(mdiodev->bus, mdiodev->addr, reg, value);

	return mdiodev_write(mdiodev, reg, value);

}



static int bcm_ns_usb3_mdio_probe(struct mdio_device *mdiodev)

drivers/phy/broadcom/phy-bcm-ns2-pcie.c

+2 −4
Original line number Diff line number Diff line
@@ -29,14 +29,12 @@ static int ns2_pci_phy_init(struct phy *p) 
	int rc;



	/* select the AFE 100MHz block page */

	rc = mdiobus_write(mdiodev->bus, mdiodev->addr,

			   BLK_ADDR_REG_OFFSET, PLL_AFE1_100MHZ_BLK);

	rc = mdiodev_write(mdiodev, BLK_ADDR_REG_OFFSET, PLL_AFE1_100MHZ_BLK);

	if (rc)

		goto err;



	/* set the 100 MHz reference clock amplitude to 2.05 v */

	rc = mdiobus_write(mdiodev->bus, mdiodev->addr,

			   PLL_CLK_AMP_OFFSET, PLL_CLK_AMP_2P05V);

	rc = mdiodev_write(mdiodev, PLL_CLK_AMP_OFFSET, PLL_CLK_AMP_2P05V);

	if (rc)

		goto err;