sfc: Move definition of struct falcon_nic_data into falcon.h
This is preparation for moving Falcon-specific state required by other
Falcon-specific code.
Signed-off-by: Ben Hutchings <bhutchings@solarflare.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
diff --git a/drivers/net/sfc/falcon.c b/drivers/net/sfc/falcon.c
index 29e79f7..490bda0 100644
--- a/drivers/net/sfc/falcon.c
+++ b/drivers/net/sfc/falcon.c
@@ -14,7 +14,6 @@
#include <linux/module.h>
#include <linux/seq_file.h>
#include <linux/i2c.h>
-#include <linux/i2c-algo-bit.h>
#include <linux/mii.h>
#include "net_driver.h"
#include "bitfield.h"
@@ -33,16 +32,6 @@
* present in SFE400X evaluation boards
*/
-/**
- * struct falcon_nic_data - Falcon NIC state
- * @pci_dev2: The secondary PCI device if present
- * @i2c_data: Operations and state for I2C bit-bashing algorithm
- */
-struct falcon_nic_data {
- struct pci_dev *pci_dev2;
- struct i2c_algo_bit_data i2c_data;
-};
-
/**************************************************************************
*
* Configurable values
diff --git a/drivers/net/sfc/falcon.h b/drivers/net/sfc/falcon.h
index 54dad2d..46dd43b 100644
--- a/drivers/net/sfc/falcon.h
+++ b/drivers/net/sfc/falcon.h
@@ -11,6 +11,7 @@
#ifndef EFX_FALCON_H
#define EFX_FALCON_H
+#include <linux/i2c-algo-bit.h>
#include "net_driver.h"
#include "efx.h"
@@ -29,6 +30,16 @@
return efx->pci_dev->revision;
}
+/**
+ * struct falcon_nic_data - Falcon NIC state
+ * @pci_dev2: The secondary PCI device if present
+ * @i2c_data: Operations and state for I2C bit-bashing algorithm
+ */
+struct falcon_nic_data {
+ struct pci_dev *pci_dev2;
+ struct i2c_algo_bit_data i2c_data;
+};
+
static inline struct falcon_board *falcon_board(struct efx_nic *efx)
{
return &efx->board_info;