diff options
author | Stephen Hemminger <shemminger@linux-foundation.org> | 2007-09-25 22:01:02 -0400 |
---|---|---|
committer | David S. Miller <davem@sunset.davemloft.net> | 2007-10-10 19:50:54 -0400 |
commit | 167f53d05fccb47b6eeadac7f6705b3f2f042d03 (patch) | |
tree | ec3fe33aae26b5ec35e32bb710430300d91b0a6f /drivers/net/sky2.h | |
parent | 555382cbfc6d2187b53888190755e56f52308cd6 (diff) |
sky2: use pci_config access functions
Use the PCI layer config access functions. The driver was using the
memory mapped window in device, to workaround issues accessing the
advanced error reporting registers.
Signed-off-by: Stephen Hemminger <shemminger@linux-foundation.org>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/sky2.h')
-rw-r--r-- | drivers/net/sky2.h | 21 |
1 files changed, 0 insertions, 21 deletions
diff --git a/drivers/net/sky2.h b/drivers/net/sky2.h index 6f5e162709b6..f4a3c2f403e5 100644 --- a/drivers/net/sky2.h +++ b/drivers/net/sky2.h | |||
@@ -2129,25 +2129,4 @@ static inline void gma_set_addr(struct sky2_hw *hw, unsigned port, unsigned reg, | |||
2129 | gma_write16(hw, port, reg+4,(u16) addr[2] | ((u16) addr[3] << 8)); | 2129 | gma_write16(hw, port, reg+4,(u16) addr[2] | ((u16) addr[3] << 8)); |
2130 | gma_write16(hw, port, reg+8,(u16) addr[4] | ((u16) addr[5] << 8)); | 2130 | gma_write16(hw, port, reg+8,(u16) addr[4] | ((u16) addr[5] << 8)); |
2131 | } | 2131 | } |
2132 | |||
2133 | /* PCI config space access */ | ||
2134 | static inline u32 sky2_pci_read32(const struct sky2_hw *hw, unsigned reg) | ||
2135 | { | ||
2136 | return sky2_read32(hw, Y2_CFG_SPC + reg); | ||
2137 | } | ||
2138 | |||
2139 | static inline u16 sky2_pci_read16(const struct sky2_hw *hw, unsigned reg) | ||
2140 | { | ||
2141 | return sky2_read16(hw, Y2_CFG_SPC + reg); | ||
2142 | } | ||
2143 | |||
2144 | static inline void sky2_pci_write32(struct sky2_hw *hw, unsigned reg, u32 val) | ||
2145 | { | ||
2146 | sky2_write32(hw, Y2_CFG_SPC + reg, val); | ||
2147 | } | ||
2148 | |||
2149 | static inline void sky2_pci_write16(struct sky2_hw *hw, unsigned reg, u16 val) | ||
2150 | { | ||
2151 | sky2_write16(hw, Y2_CFG_SPC + reg, val); | ||
2152 | } | ||
2153 | #endif | 2132 | #endif |