lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

sfc: Move definition of struct falcon_nic_data into falcon.h

Browse Source 
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>
This commit is contained in:
Ben Hutchings
2009-11-23 16:05:28 +00:00
committed by David S. Miller
parent 278c0621fb
commit 5c16a96c4f
2 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
drivers/net/sfc/falcon.c
View File

@@ -14,7 +14,6 @@
#include <linux/module.h> #include <linux/module.h>
#include <linux/seq_file.h> #include <linux/seq_file.h>
#include <linux/i2c.h> #include <linux/i2c.h>
#include <linux/i2c-algo-bit.h>
#include <linux/mii.h> #include <linux/mii.h>
#include "net_driver.h" #include "net_driver.h"
#include "bitfield.h" #include "bitfield.h"
@@ -33,16 +32,6 @@
* present in SFE400X evaluation boards * 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 * Configurable values

11
drivers/net/sfc/falcon.h
View File

@@ -11,6 +11,7 @@
#ifndef EFX_FALCON_H #ifndef EFX_FALCON_H
#define EFX_FALCON_H #define EFX_FALCON_H
#include <linux/i2c-algo-bit.h>
#include "net_driver.h" #include "net_driver.h"
#include "efx.h" #include "efx.h"
@@ -29,6 +30,16 @@ static inline int falcon_rev(struct efx_nic *efx)
return efx->pci_dev->revision; 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) static inline struct falcon_board *falcon_board(struct efx_nic *efx)
{ {
return &efx->board_info; return &efx->board_info;