Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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: Sean Anderson <sean.anderson@seco.com>
Reviewed-by: Florian Fainelli <f.fainelli@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

authored by

Sean Anderson and committed by
David S. Miller
65aa371e c8fb89a7

+12 -14
+3 -3
drivers/base/regmap/regmap-mdio.c
··· 14 14 { 15 15 int ret; 16 16 17 - ret = mdiobus_read(mdio_dev->bus, mdio_dev->addr, reg); 17 + ret = mdiodev_read(mdio_dev, reg); 18 18 if (ret < 0) 19 19 return ret; 20 20 ··· 24 24 25 25 static int regmap_mdio_write(struct mdio_device *mdio_dev, u32 reg, unsigned int val) 26 26 { 27 - return mdiobus_write(mdio_dev->bus, mdio_dev->addr, reg, val); 27 + return mdiodev_write(mdio_dev, reg, val); 28 28 } 29 29 30 30 static int regmap_mdio_c22_read(void *context, unsigned int reg, unsigned int *val) ··· 44 44 if (unlikely(reg & ~REGNUM_C22_MASK)) 45 45 return -ENXIO; 46 46 47 - return mdiobus_write(mdio_dev->bus, mdio_dev->addr, reg, val); 47 + return mdiodev_write(mdio_dev, reg, val); 48 48 } 49 49 50 50 static const struct regmap_bus regmap_mdio_c22_bus = {
+6 -6
drivers/net/dsa/xrs700x/xrs700x_mdio.c
··· 31 31 32 32 uval = (u16)FIELD_GET(GENMASK(31, 16), reg); 33 33 34 - ret = mdiobus_write(mdiodev->bus, mdiodev->addr, XRS_MDIO_IBA1, uval); 34 + ret = mdiodev_write(mdiodev, XRS_MDIO_IBA1, uval); 35 35 if (ret < 0) { 36 36 dev_err(dev, "xrs mdiobus_write returned %d\n", ret); 37 37 return ret; ··· 39 39 40 40 uval = (u16)((reg & GENMASK(15, 1)) | XRS_IB_READ); 41 41 42 - ret = mdiobus_write(mdiodev->bus, mdiodev->addr, XRS_MDIO_IBA0, uval); 42 + ret = mdiodev_write(mdiodev, XRS_MDIO_IBA0, uval); 43 43 if (ret < 0) { 44 44 dev_err(dev, "xrs mdiobus_write returned %d\n", ret); 45 45 return ret; 46 46 } 47 47 48 - ret = mdiobus_read(mdiodev->bus, mdiodev->addr, XRS_MDIO_IBD); 48 + ret = mdiodev_read(mdiodev, XRS_MDIO_IBD); 49 49 if (ret < 0) { 50 50 dev_err(dev, "xrs mdiobus_read returned %d\n", ret); 51 51 return ret; ··· 64 64 u16 uval; 65 65 int ret; 66 66 67 - ret = mdiobus_write(mdiodev->bus, mdiodev->addr, XRS_MDIO_IBD, (u16)val); 67 + ret = mdiodev_write(mdiodev, XRS_MDIO_IBD, (u16)val); 68 68 if (ret < 0) { 69 69 dev_err(dev, "xrs mdiobus_write returned %d\n", ret); 70 70 return ret; ··· 72 72 73 73 uval = (u16)FIELD_GET(GENMASK(31, 16), reg); 74 74 75 - ret = mdiobus_write(mdiodev->bus, mdiodev->addr, XRS_MDIO_IBA1, uval); 75 + ret = mdiodev_write(mdiodev, XRS_MDIO_IBA1, uval); 76 76 if (ret < 0) { 77 77 dev_err(dev, "xrs mdiobus_write returned %d\n", ret); 78 78 return ret; ··· 80 80 81 81 uval = (u16)((reg & GENMASK(15, 1)) | XRS_IB_WRITE); 82 82 83 - ret = mdiobus_write(mdiodev->bus, mdiodev->addr, XRS_MDIO_IBA0, uval); 83 + ret = mdiodev_write(mdiodev, XRS_MDIO_IBA0, uval); 84 84 if (ret < 0) { 85 85 dev_err(dev, "xrs mdiobus_write returned %d\n", ret); 86 86 return ret;
+1 -1
drivers/phy/broadcom/phy-bcm-ns-usb3.c
··· 183 183 { 184 184 struct mdio_device *mdiodev = usb3->mdiodev; 185 185 186 - return mdiobus_write(mdiodev->bus, mdiodev->addr, reg, value); 186 + return mdiodev_write(mdiodev, reg, value); 187 187 } 188 188 189 189 static int bcm_ns_usb3_mdio_probe(struct mdio_device *mdiodev)
+2 -4
drivers/phy/broadcom/phy-bcm-ns2-pcie.c
··· 29 29 int rc; 30 30 31 31 /* select the AFE 100MHz block page */ 32 - rc = mdiobus_write(mdiodev->bus, mdiodev->addr, 33 - BLK_ADDR_REG_OFFSET, PLL_AFE1_100MHZ_BLK); 32 + rc = mdiodev_write(mdiodev, BLK_ADDR_REG_OFFSET, PLL_AFE1_100MHZ_BLK); 34 33 if (rc) 35 34 goto err; 36 35 37 36 /* set the 100 MHz reference clock amplitude to 2.05 v */ 38 - rc = mdiobus_write(mdiodev->bus, mdiodev->addr, 39 - PLL_CLK_AMP_OFFSET, PLL_CLK_AMP_2P05V); 37 + rc = mdiodev_write(mdiodev, PLL_CLK_AMP_OFFSET, PLL_CLK_AMP_2P05V); 40 38 if (rc) 41 39 goto err; 42 40