sfc: Make board information explicitly Falcon-specific

Rename struct efx_board to struct falcon_board.

Introduce and use inline function to look up board info from struct
efx_nic, in preparation for moving it.

Move board init and fini calls into NIC probe and remove functions.

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

1 files changed, 11 insertions, 0 deletions

diff --git a/drivers/net/sfc/falcon.c b/drivers/net/sfc/falcon.c
index 865638b035bf..29e79f77b732 100644
--- a/drivers/net/sfc/falcon.c
+++ b/drivers/net/sfc/falcon.c
@@ -2877,8 +2877,17 @@ int falcon_probe_nic(struct efx_nic *efx)
         if (rc)
                 goto fail5;
 
+        rc = falcon_board(efx)->init(efx);
+        if (rc) {
+                EFX_ERR(efx, "failed to initialise board\n");
+                goto fail6;
+        }
+
         return 0;
 
+ fail6:
+        BUG_ON(i2c_del_adapter(&efx->i2c_adap));
+        memset(&efx->i2c_adap, 0, sizeof(efx->i2c_adap));
  fail5:
         falcon_remove_spi_devices(efx);
         falcon_free_buffer(efx, &efx->irq_status);
@@ -3070,6 +3079,8 @@ void falcon_remove_nic(struct efx_nic *efx)
         struct falcon_nic_data *nic_data = efx->nic_data;
         int rc;
 
+        falcon_board(efx)->fini(efx);
+
         /* Remove I2C adapter and clear it in preparation for a retry */
         rc = i2c_del_adapter(&efx->i2c_adap);
         BUG_ON(rc);