1 files changed, 8 insertions, 8 deletions

diff --git a/drivers/net/sfc/falcon.h b/drivers/net/sfc/falcon.h
index a561f6758bc6..81196a0fb504 100644
--- a/drivers/net/sfc/falcon.h
+++ b/drivers/net/sfc/falcon.h
@@ -19,15 +19,15 @@
  * Falcon hardware control
  */
 
-enum falcon_revision {
-        FALCON_REV_A0 = 0,
-        FALCON_REV_A1 = 1,
-        FALCON_REV_B0 = 2,
+enum {
+        EFX_REV_FALCON_A0 = 0,
+        EFX_REV_FALCON_A1 = 1,
+        EFX_REV_FALCON_B0 = 2,
 };
 
-static inline int falcon_rev(struct efx_nic *efx)
+static inline int efx_nic_rev(struct efx_nic *efx)
 {
-        return efx->pci_dev->revision;
+        return efx->type->revision;
 }
 
 /**
@@ -95,8 +95,8 @@ static inline struct falcon_board *falcon_board(struct efx_nic *efx)
         return &data->board;
 }
 
-extern struct efx_nic_type falcon_a_nic_type;
-extern struct efx_nic_type falcon_b_nic_type;
+extern struct efx_nic_type falcon_a1_nic_type;
+extern struct efx_nic_type falcon_b0_nic_type;
 
 /**************************************************************************
  *