diff options
| author | Mark Einon <mark.einon@gmail.com> | 2011-08-30 12:47:23 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-09-06 16:49:28 -0700 |
| commit | f660732fdcf2b7eaf3ebfd9f7b6bc921837536f5 (patch) | |
| tree | ee9701af7d9d762a3de9ef8ba75c2659c90199fa /drivers/staging/et131x/et131x.h | |
| parent | f6807514910f2d3c9d19e2cdd369a31aade73e6f (diff) | |
staging: et131x: Remove xcvr_addr and et131x_xcvr_find
Use the phy_device equivalents instead.
Signed-off-by: Mark Einon <mark.einon@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/et131x/et131x.h')
| -rw-r--r-- | drivers/staging/et131x/et131x.h | 17 |
1 files changed, 7 insertions, 10 deletions
diff --git a/drivers/staging/et131x/et131x.h b/drivers/staging/et131x/et131x.h index 9dee7bce073..763396a9a59 100644 --- a/drivers/staging/et131x/et131x.h +++ b/drivers/staging/et131x/et131x.h @@ -59,7 +59,7 @@ void et131x_align_allocated_memory(struct et131x_adapter *adapter, u64 *phys_addr, u64 *offset, u64 mask); -int et131x_adapter_setup(struct et131x_adapter *adapter); +void et131x_adapter_setup(struct et131x_adapter *adapter); int et131x_adapter_memory_alloc(struct et131x_adapter *adapter); void et131x_adapter_memory_free(struct et131x_adapter *adapter); void et131x_hwaddr_init(struct et131x_adapter *adapter); @@ -104,16 +104,13 @@ void et131x_setphy_normal(struct et131x_adapter *adapter); /* static inline function does not work because et131x_adapter is not always * defined */ -int et131x_phy_mii_read(struct et131x_adapter *adapter, u8 xcvrAddr, - u8 xcvrReg, u16 *value); -#define et131x_mii_read(adapter, xcvrReg, value) \ - et131x_phy_mii_read((adapter), \ - (adapter)->stats.xcvr_addr, \ - (xcvrReg), (value)) - +int et131x_phy_mii_read(struct et131x_adapter *adapter, u8 addr, + u8 reg, u16 *value); +int32_t et131x_mii_read(struct et131x_adapter *adapter, + u8 reg, u16 *value); int32_t et131x_mii_write(struct et131x_adapter *adapter, - u8 xcvReg, u16 value); -void et131x_mii_check(struct et131x_adapter *pAdapter, + u8 reg, u16 value); +void et131x_mii_check(struct et131x_adapter *adapter, u16 bmsr, u16 bmsr_ints); int et131x_mdio_read(struct mii_bus *bus, int phy_addr, int reg); |