diff options
-rw-r--r-- | drivers/net/sky2.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/net/sky2.c b/drivers/net/sky2.c index 9dc4adb95a7c..f03bf79ca1f5 100644 --- a/drivers/net/sky2.c +++ b/drivers/net/sky2.c | |||
@@ -704,7 +704,7 @@ static inline struct sky2_tx_le *get_tx_le(struct sky2_port *sky2) | |||
704 | * This is a workaround code taken from SysKonnect sk98lin driver | 704 | * This is a workaround code taken from SysKonnect sk98lin driver |
705 | * to deal with chip bug on Yukon EC rev 0 in the wraparound case. | 705 | * to deal with chip bug on Yukon EC rev 0 in the wraparound case. |
706 | */ | 706 | */ |
707 | static inline void sky2_put_idx(struct sky2_hw *hw, unsigned q, | 707 | static void sky2_put_idx(struct sky2_hw *hw, unsigned q, |
708 | u16 idx, u16 *last, u16 size) | 708 | u16 idx, u16 *last, u16 size) |
709 | { | 709 | { |
710 | wmb(); | 710 | wmb(); |
@@ -749,7 +749,7 @@ static inline u32 high32(dma_addr_t a) | |||
749 | } | 749 | } |
750 | 750 | ||
751 | /* Build description to hardware about buffer */ | 751 | /* Build description to hardware about buffer */ |
752 | static inline void sky2_rx_add(struct sky2_port *sky2, dma_addr_t map) | 752 | static void sky2_rx_add(struct sky2_port *sky2, dma_addr_t map) |
753 | { | 753 | { |
754 | struct sky2_rx_le *le; | 754 | struct sky2_rx_le *le; |
755 | u32 hi = high32(map); | 755 | u32 hi = high32(map); |
@@ -1080,7 +1080,7 @@ static inline int tx_avail(const struct sky2_port *sky2) | |||
1080 | } | 1080 | } |
1081 | 1081 | ||
1082 | /* Estimate of number of transmit list elements required */ | 1082 | /* Estimate of number of transmit list elements required */ |
1083 | static inline unsigned tx_le_req(const struct sk_buff *skb) | 1083 | static unsigned tx_le_req(const struct sk_buff *skb) |
1084 | { | 1084 | { |
1085 | unsigned count; | 1085 | unsigned count; |
1086 | 1086 | ||
@@ -1792,7 +1792,7 @@ error: | |||
1792 | */ | 1792 | */ |
1793 | #define TX_NO_STATUS 0xffff | 1793 | #define TX_NO_STATUS 0xffff |
1794 | 1794 | ||
1795 | static inline void sky2_tx_check(struct sky2_hw *hw, int port, u16 last) | 1795 | static void sky2_tx_check(struct sky2_hw *hw, int port, u16 last) |
1796 | { | 1796 | { |
1797 | if (last != TX_NO_STATUS) { | 1797 | if (last != TX_NO_STATUS) { |
1798 | struct net_device *dev = hw->dev[port]; | 1798 | struct net_device *dev = hw->dev[port]; |
@@ -2280,7 +2280,7 @@ static int sky2_reset(struct sky2_hw *hw) | |||
2280 | return 0; | 2280 | return 0; |
2281 | } | 2281 | } |
2282 | 2282 | ||
2283 | static inline u32 sky2_supported_modes(const struct sky2_hw *hw) | 2283 | static u32 sky2_supported_modes(const struct sky2_hw *hw) |
2284 | { | 2284 | { |
2285 | u32 modes; | 2285 | u32 modes; |
2286 | if (hw->copper) { | 2286 | if (hw->copper) { |
@@ -3025,7 +3025,7 @@ static __devinit struct net_device *sky2_init_netdev(struct sky2_hw *hw, | |||
3025 | return dev; | 3025 | return dev; |
3026 | } | 3026 | } |
3027 | 3027 | ||
3028 | static inline void sky2_show_addr(struct net_device *dev) | 3028 | static void __devinit sky2_show_addr(struct net_device *dev) |
3029 | { | 3029 | { |
3030 | const struct sky2_port *sky2 = netdev_priv(dev); | 3030 | const struct sky2_port *sky2 = netdev_priv(dev); |
3031 | 3031 | ||