[PATCH RFC 6/7] net: phy: remove the indirect MMD read/write methods

[Russell King]

Remove the indirect MMD read/write methods which are now no longer
necessary.

Signed-off-by: Russell King 
---
 drivers/net/phy/phy-core.c | 119 +
 include/linux/phy.h|  42 
 2 files changed, 35 insertions(+), 126 deletions(-)

diff --git a/drivers/net/phy/phy-core.c b/drivers/net/phy/phy-core.c
index b50b3a64cf6a..80795ccd3fab 100644
--- a/drivers/net/phy/phy-core.c
+++ b/drivers/net/phy/phy-core.c
@@ -23,102 +23,41 @@ static inline void mmd_phy_indirect(struct mii_bus *bus, 
int prtad, int devad,
 }
 
 /**
- * phy_read_mmd_indirect - reads data from the MMD registers
- * @phydev: The PHY device bus
- * @prtad: MMD Address
- * @devad: MMD DEVAD
- *
- * Description: it reads data from the MMD registers (clause 22 to access to
- * clause 45) of the specified phy address.
- * To read these register we have:
- * 1) Write reg 13 // DEVAD
- * 2) Write reg 14 // MMD Address
- * 3) Write reg 13 // MMD Data Command for MMD DEVAD
- * 3) Read  reg 14 // Read MMD data
- */
-int phy_read_mmd_indirect(struct phy_device *phydev, int prtad, int devad)
-{
-   struct phy_driver *phydrv = phydev->drv;
-   int addr = phydev->mdio.addr;
-   int value = -1;
-
-   if (!phydrv->read_mmd_indirect) {
-   struct mii_bus *bus = phydev->mdio.bus;
-
-   mutex_lock(>mdio_lock);
-   mmd_phy_indirect(bus, prtad, devad, addr);
-
-   /* Read the content of the MMD's selected register */
-   value = bus->read(bus, addr, MII_MMD_DATA);
-   mutex_unlock(>mdio_lock);
-   } else {
-   value = phydrv->read_mmd_indirect(phydev, prtad, devad, addr);
-   }
-   return value;
-}
-EXPORT_SYMBOL(phy_read_mmd_indirect);
-
-/**
  * phy_read_mmd - Convenience function for reading a register
  * from an MMD on a given PHY.
  * @phydev: The phy_device struct
- * @devad: The MMD to read from
- * @regnum: The register on the MMD to read
+ * @devad: The MMD to read from (0..31)
+ * @regnum: The register on the MMD to read (0..65535)
  *
  * Same rules as for phy_read();
  */
 int phy_read_mmd(struct phy_device *phydev, int devad, u32 regnum)
 {
+   int val;
+
if (regnum > (u16)~0 || devad > 32)
return -EINVAL;
 
-   if (phydev->drv->read_mmd)
-   return phydev->drv->read_mmd(phydev, devad, regnum);
-
-   if (phydev->is_c45) {
+   if (phydev->drv->read_mmd) {
+   val = phydev->drv->read_mmd(phydev, devad, regnum);
+   } else if (phydev->is_c45) {
u32 addr = MII_ADDR_C45 | (devad << 16) | (regnum & 0x);
-   return mdiobus_read(phydev->mdio.bus, phydev->mdio.addr, addr);
-   }
-
-   return phy_read_mmd_indirect(phydev, regnum, devad);
-}
-EXPORT_SYMBOL(phy_read_mmd);
-
-/**
- * phy_write_mmd_indirect - writes data to the MMD registers
- * @phydev: The PHY device
- * @prtad: MMD Address
- * @devad: MMD DEVAD
- * @data: data to write in the MMD register
- *
- * Description: Write data from the MMD registers of the specified
- * phy address.
- * To write these register we have:
- * 1) Write reg 13 // DEVAD
- * 2) Write reg 14 // MMD Address
- * 3) Write reg 13 // MMD Data Command for MMD DEVAD
- * 3) Write reg 14 // Write MMD data
- */
-void phy_write_mmd_indirect(struct phy_device *phydev, int prtad,
-  int devad, u32 data)
-{
-   struct phy_driver *phydrv = phydev->drv;
-   int addr = phydev->mdio.addr;
 
-   if (!phydrv->write_mmd_indirect) {
+   val = mdiobus_read(phydev->mdio.bus, phydev->mdio.addr, addr);
+   } else {
struct mii_bus *bus = phydev->mdio.bus;
+   int phy_addr = phydev->mdio.addr;
 
mutex_lock(>mdio_lock);
-   mmd_phy_indirect(bus, prtad, devad, addr);
+   mmd_phy_indirect(bus, regnum, devad, phy_addr);
 
-   /* Write the data into MMD's selected register */
-   bus->write(bus, addr, MII_MMD_DATA, data);
+   /* Read the content of the MMD's selected register */
+   val = bus->read(bus, phy_addr, MII_MMD_DATA);
mutex_unlock(>mdio_lock);
-   } else {
-   phydrv->write_mmd_indirect(phydev, prtad, devad, addr, data);
}
+   return val;
 }
-EXPORT_SYMBOL(phy_write_mmd_indirect);
+EXPORT_SYMBOL(phy_read_mmd);
 
 /**
  * phy_write_mmd - Convenience function for writing a register
@@ -132,19 +71,31 @@ EXPORT_SYMBOL(phy_write_mmd_indirect);
  */
 int phy_write_mmd(struct phy_device *phydev, int devad, u32 regnum, u16 val)
 {
+   int ret;
+
if (regnum > (u16)~0 || devad > 32)
return -EINVAL;
 
-   if (phydev->drv->read_mmd)
-   return phydev->drv->write_mmd(phydev, devad, regnum, val);
-
-   if (phydev->is_c45) {
+   if (phydev->drv->read_mmd) {
+   ret = 

[PATCH RFC 6/7] net: phy: remove the indirect MMD read/write methods

[Russell King]

Remove the indirect MMD read/write methods which are now no longer
necessary.

Signed-off-by: Russell King 
---
 drivers/net/phy/phy-core.c | 119 +
 include/linux/phy.h|  18 ---
 2 files changed, 35 insertions(+), 102 deletions(-)

diff --git a/drivers/net/phy/phy-core.c b/drivers/net/phy/phy-core.c
index b50b3a64cf6a..80795ccd3fab 100644
--- a/drivers/net/phy/phy-core.c
+++ b/drivers/net/phy/phy-core.c
@@ -23,102 +23,41 @@ static inline void mmd_phy_indirect(struct mii_bus *bus, 
int prtad, int devad,
 }
 
 /**
- * phy_read_mmd_indirect - reads data from the MMD registers
- * @phydev: The PHY device bus
- * @prtad: MMD Address
- * @devad: MMD DEVAD
- *
- * Description: it reads data from the MMD registers (clause 22 to access to
- * clause 45) of the specified phy address.
- * To read these register we have:
- * 1) Write reg 13 // DEVAD
- * 2) Write reg 14 // MMD Address
- * 3) Write reg 13 // MMD Data Command for MMD DEVAD
- * 3) Read  reg 14 // Read MMD data
- */
-int phy_read_mmd_indirect(struct phy_device *phydev, int prtad, int devad)
-{
-   struct phy_driver *phydrv = phydev->drv;
-   int addr = phydev->mdio.addr;
-   int value = -1;
-
-   if (!phydrv->read_mmd_indirect) {
-   struct mii_bus *bus = phydev->mdio.bus;
-
-   mutex_lock(>mdio_lock);
-   mmd_phy_indirect(bus, prtad, devad, addr);
-
-   /* Read the content of the MMD's selected register */
-   value = bus->read(bus, addr, MII_MMD_DATA);
-   mutex_unlock(>mdio_lock);
-   } else {
-   value = phydrv->read_mmd_indirect(phydev, prtad, devad, addr);
-   }
-   return value;
-}
-EXPORT_SYMBOL(phy_read_mmd_indirect);
-
-/**
  * phy_read_mmd - Convenience function for reading a register
  * from an MMD on a given PHY.
  * @phydev: The phy_device struct
- * @devad: The MMD to read from
- * @regnum: The register on the MMD to read
+ * @devad: The MMD to read from (0..31)
+ * @regnum: The register on the MMD to read (0..65535)
  *
  * Same rules as for phy_read();
  */
 int phy_read_mmd(struct phy_device *phydev, int devad, u32 regnum)
 {
+   int val;
+
if (regnum > (u16)~0 || devad > 32)
return -EINVAL;
 
-   if (phydev->drv->read_mmd)
-   return phydev->drv->read_mmd(phydev, devad, regnum);
-
-   if (phydev->is_c45) {
+   if (phydev->drv->read_mmd) {
+   val = phydev->drv->read_mmd(phydev, devad, regnum);
+   } else if (phydev->is_c45) {
u32 addr = MII_ADDR_C45 | (devad << 16) | (regnum & 0x);
-   return mdiobus_read(phydev->mdio.bus, phydev->mdio.addr, addr);
-   }
-
-   return phy_read_mmd_indirect(phydev, regnum, devad);
-}
-EXPORT_SYMBOL(phy_read_mmd);
-
-/**
- * phy_write_mmd_indirect - writes data to the MMD registers
- * @phydev: The PHY device
- * @prtad: MMD Address
- * @devad: MMD DEVAD
- * @data: data to write in the MMD register
- *
- * Description: Write data from the MMD registers of the specified
- * phy address.
- * To write these register we have:
- * 1) Write reg 13 // DEVAD
- * 2) Write reg 14 // MMD Address
- * 3) Write reg 13 // MMD Data Command for MMD DEVAD
- * 3) Write reg 14 // Write MMD data
- */
-void phy_write_mmd_indirect(struct phy_device *phydev, int prtad,
-  int devad, u32 data)
-{
-   struct phy_driver *phydrv = phydev->drv;
-   int addr = phydev->mdio.addr;
 
-   if (!phydrv->write_mmd_indirect) {
+   val = mdiobus_read(phydev->mdio.bus, phydev->mdio.addr, addr);
+   } else {
struct mii_bus *bus = phydev->mdio.bus;
+   int phy_addr = phydev->mdio.addr;
 
mutex_lock(>mdio_lock);
-   mmd_phy_indirect(bus, prtad, devad, addr);
+   mmd_phy_indirect(bus, regnum, devad, phy_addr);
 
-   /* Write the data into MMD's selected register */
-   bus->write(bus, addr, MII_MMD_DATA, data);
+   /* Read the content of the MMD's selected register */
+   val = bus->read(bus, phy_addr, MII_MMD_DATA);
mutex_unlock(>mdio_lock);
-   } else {
-   phydrv->write_mmd_indirect(phydev, prtad, devad, addr, data);
}
+   return val;
 }
-EXPORT_SYMBOL(phy_write_mmd_indirect);
+EXPORT_SYMBOL(phy_read_mmd);
 
 /**
  * phy_write_mmd - Convenience function for writing a register
@@ -132,19 +71,31 @@ EXPORT_SYMBOL(phy_write_mmd_indirect);
  */
 int phy_write_mmd(struct phy_device *phydev, int devad, u32 regnum, u16 val)
 {
+   int ret;
+
if (regnum > (u16)~0 || devad > 32)
return -EINVAL;
 
-   if (phydev->drv->read_mmd)
-   return phydev->drv->write_mmd(phydev, devad, regnum, val);
-
-   if (phydev->is_c45) {
+   if (phydev->drv->read_mmd) {
+   ret =