phylib: use MDIO_DEVS[12]
authorSergei Shtylyov <sergei.shtylyov@cogentembedded.com>
Fri, 22 Aug 2014 19:56:47 +0000 (23:56 +0400)
committerDavid S. Miller <davem@davemloft.net>
Sat, 23 Aug 2014 04:16:51 +0000 (21:16 -0700)
The bare register numbers are used despite <uapi/linux/mdio.h> has MDIO_DEVS[12]
#define'd for those.

Signed-off-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
Acked-by: Florian Fainelli <f.fainelli@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/phy/phy_device.c

index ca5ec3e18d3662daeebd999291cc6a78c73e79de..3fc91e89f5a564bb36ab251c81ec083fc7cab68d 100644 (file)
@@ -230,13 +230,13 @@ static int get_phy_c45_ids(struct mii_bus *bus, int addr, u32 *phy_id,
        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;