diff options
| author | Ben Hutchings <bhutchings@solarflare.com> | 2009-11-23 16:06:02 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-11-24 10:58:52 -0800 |
| commit | e775fb93a880d218ce0b3fd405278dd78f86c405 (patch) | |
| tree | 5f5c31161f7f11a9611481396de92964e2fdaaae /drivers/net/sfc/falcon.h | |
| parent | 3759433db2f7340ddec3abd55ebb1178600d014e (diff) | |
| download | linux-e775fb93a880d218ce0b3fd405278dd78f86c405.tar.gz linux-e775fb93a880d218ce0b3fd405278dd78f86c405.tar.bz2 linux-e775fb93a880d218ce0b3fd405278dd78f86c405.zip | |
sfc: Move all I2C stuff into struct falcon_board
Signed-off-by: Ben Hutchings <bhutchings@solarflare.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/sfc/falcon.h')
| -rw-r--r-- | drivers/net/sfc/falcon.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/net/sfc/falcon.h b/drivers/net/sfc/falcon.h index 3e9696c12caa..0da5ea7908b0 100644 --- a/drivers/net/sfc/falcon.h +++ b/drivers/net/sfc/falcon.h @@ -40,6 +40,8 @@ static inline int falcon_rev(struct efx_nic *efx) * @set_id_led: Set state of identifying LED or revert to automatic function * @monitor: Board-specific health check function * @fini: Shut down hardware and free resources + * @i2c_adap: I2C adapter for on-board peripherals + * @i2c_data: Data for bit-banging algorithm * @hwmon_client: I2C client for hardware monitor * @ioexp_client: I2C client for power/port control */ @@ -52,18 +54,18 @@ struct falcon_board { void (*set_id_led) (struct efx_nic *efx, enum efx_led_mode mode); int (*monitor) (struct efx_nic *nic); void (*fini) (struct efx_nic *nic); + struct i2c_adapter i2c_adap; + struct i2c_algo_bit_data i2c_data; struct i2c_client *hwmon_client, *ioexp_client; }; /** * 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 * @board: Board state and functions */ struct falcon_nic_data { struct pci_dev *pci_dev2; - struct i2c_algo_bit_data i2c_data; struct falcon_board board; }; |