sfc: Add support for MMDs numbered >15

Combine DEVS0 and DEVS1 registers into a 32-bit mask instead of
reading just DEVS0.

Signed-off-by: Ben Hutchings <bhutchings@solarflare.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 4 insertions, 4 deletions

diff --git a/drivers/net/sfc/xfp_phy.c b/drivers/net/sfc/xfp_phy.c
index 971a24b59fa..0413d135e4a 100644
--- a/drivers/net/sfc/xfp_phy.c
+++ b/drivers/net/sfc/xfp_phy.c
@@ -19,9 +19,9 @@
 #include "phy.h"
 #include "mac.h"
 
-#define XFP_REQUIRED_DEVS (MDIO_MMDREG_DEVS0_PCS |      \
-                           MDIO_MMDREG_DEVS0_PMAPMD |   \
-                           MDIO_MMDREG_DEVS0_PHYXS)
+#define XFP_REQUIRED_DEVS (MDIO_MMDREG_DEVS_PCS |       \
+                           MDIO_MMDREG_DEVS_PMAPMD |    \
+                           MDIO_MMDREG_DEVS_PHYXS)
 
 #define XFP_LOOPBACKS ((1 << LOOPBACK_PCS) |            \
                        (1 << LOOPBACK_PMAPMD) |         \
@@ -64,7 +64,7 @@ static int xfp_reset_phy(struct efx_nic *efx)
         /* Check that all the MMDs we expect are present and responding. We
          * expect faults on some if the link is down, but not on the PHY XS */
         rc = mdio_clause45_check_mmds(efx, XFP_REQUIRED_DEVS,
-                                      MDIO_MMDREG_DEVS0_PHYXS);
+                                      MDIO_MMDREG_DEVS_PHYXS);
         if (rc < 0)
                 goto fail;