Skip to contentSkip to conversation

phylib: use MDIO_DEVS[12]

PATCH Applied Sergei Shtylyov 3 participants 3 messages Aug 22, 2014 – Aug 23, 2014

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 phylib: use MDIO_DEVS[12]

The bare register numbers are used despite <uapi/linux/mdio.h> has MDIO_DEVS[12] #define'd for those.

---
This patch is against DaveM's 'net-next.git' repo.

 drivers/net/phy/phy_device.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/net/phy/phy_device.c +2 -2
Index: net-next/drivers/net/phy/phy_device.c
===================================================================
@@ -230,13 +230,13 @@ static int get_phy_c45_ids(struct mii_bu
 	for (i = 1;
 	     i < num_ids && c45_ids->devices_in_package == 0;
 	     i++) {
-		reg_addr = MII_ADDR_C45 | i << 16 | 6;
+		reg_addr = MII_ADDR_C45 | i << 16 | MDIO_DEVS2;
 		phy_reg = mdiobus_read(bus, addr, reg_addr);
 		if (phy_reg < 0)
 			return -EIO;
 		c45_ids->devices_in_package = (phy_reg & 0xffff) << 16;
 
-		reg_addr = MII_ADDR_C45 | i << 16 | 5;
+		reg_addr = MII_ADDR_C45 | i << 16 | MDIO_DEVS1;
 		phy_reg = mdiobus_read(bus, addr, reg_addr);
 		if (phy_reg < 0)
 			return -EIO;
Acked-by on v1 1/1
#1 lore raw

2014-08-22 12:56 GMT-07:00 Sergei Shtylyov <[email protected]>:

Quoted 4 lines

The bare register numbers are used despite <uapi/linux/mdio.h> has MDIO_DEVS[12] #define'd for those.

Quoted 28 lines

---
This patch is against DaveM's 'net-next.git' repo.

 drivers/net/phy/phy_device.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Index: net-next/drivers/net/phy/phy_device.c
===================================================================

drivers/net/phy/phy_device.c +2 -2
@@ -230,13 +230,13 @@ static int get_phy_c45_ids(struct mii_bu
        for (i = 1;
             i < num_ids && c45_ids->devices_in_package == 0;
             i++) {
-               reg_addr = MII_ADDR_C45 | i << 16 | 6;
+               reg_addr = MII_ADDR_C45 | i << 16 | MDIO_DEVS2;
                phy_reg = mdiobus_read(bus, addr, reg_addr);
                if (phy_reg < 0)
                        return -EIO;
                c45_ids->devices_in_package = (phy_reg & 0xffff) << 16;
 
-               reg_addr = MII_ADDR_C45 | i << 16 | 5;
+               reg_addr = MII_ADDR_C45 | i << 16 | MDIO_DEVS1;
                phy_reg = mdiobus_read(bus, addr, reg_addr);
                if (phy_reg < 0)
                        return -EIO;
Signature · 1 line
Florian