Commit 4a35ec90 authored by Stephen Hemminger's avatar Stephen Hemminger

[PATCH] tlan: make inline's static (rev2)

Make inline functions static to avoid polluting global namespace.
Signed-off-by: default avatarStephen Hemminger <shemminger@osdl.org>
Signed-off-by: default avatarJeff Garzik <jgarzik@pobox.com>
parent bd53c115
...@@ -443,7 +443,7 @@ typedef struct tlan_private_tag { ...@@ -443,7 +443,7 @@ typedef struct tlan_private_tag {
/* Routines to access internal registers. */ /* Routines to access internal registers. */
inline u8 TLan_DioRead8(u16 base_addr, u16 internal_addr) static inline u8 TLan_DioRead8(u16 base_addr, u16 internal_addr)
{ {
outw(internal_addr, base_addr + TLAN_DIO_ADR); outw(internal_addr, base_addr + TLAN_DIO_ADR);
return (inb((base_addr + TLAN_DIO_DATA) + (internal_addr & 0x3))); return (inb((base_addr + TLAN_DIO_DATA) + (internal_addr & 0x3)));
...@@ -453,7 +453,7 @@ inline u8 TLan_DioRead8(u16 base_addr, u16 internal_addr) ...@@ -453,7 +453,7 @@ inline u8 TLan_DioRead8(u16 base_addr, u16 internal_addr)
inline u16 TLan_DioRead16(u16 base_addr, u16 internal_addr) static inline u16 TLan_DioRead16(u16 base_addr, u16 internal_addr)
{ {
outw(internal_addr, base_addr + TLAN_DIO_ADR); outw(internal_addr, base_addr + TLAN_DIO_ADR);
return (inw((base_addr + TLAN_DIO_DATA) + (internal_addr & 0x2))); return (inw((base_addr + TLAN_DIO_DATA) + (internal_addr & 0x2)));
...@@ -463,7 +463,7 @@ inline u16 TLan_DioRead16(u16 base_addr, u16 internal_addr) ...@@ -463,7 +463,7 @@ inline u16 TLan_DioRead16(u16 base_addr, u16 internal_addr)
inline u32 TLan_DioRead32(u16 base_addr, u16 internal_addr) static inline u32 TLan_DioRead32(u16 base_addr, u16 internal_addr)
{ {
outw(internal_addr, base_addr + TLAN_DIO_ADR); outw(internal_addr, base_addr + TLAN_DIO_ADR);
return (inl(base_addr + TLAN_DIO_DATA)); return (inl(base_addr + TLAN_DIO_DATA));
...@@ -473,7 +473,7 @@ inline u32 TLan_DioRead32(u16 base_addr, u16 internal_addr) ...@@ -473,7 +473,7 @@ inline u32 TLan_DioRead32(u16 base_addr, u16 internal_addr)
inline void TLan_DioWrite8(u16 base_addr, u16 internal_addr, u8 data) static inline void TLan_DioWrite8(u16 base_addr, u16 internal_addr, u8 data)
{ {
outw(internal_addr, base_addr + TLAN_DIO_ADR); outw(internal_addr, base_addr + TLAN_DIO_ADR);
outb(data, base_addr + TLAN_DIO_DATA + (internal_addr & 0x3)); outb(data, base_addr + TLAN_DIO_DATA + (internal_addr & 0x3));
...@@ -483,7 +483,7 @@ inline void TLan_DioWrite8(u16 base_addr, u16 internal_addr, u8 data) ...@@ -483,7 +483,7 @@ inline void TLan_DioWrite8(u16 base_addr, u16 internal_addr, u8 data)
inline void TLan_DioWrite16(u16 base_addr, u16 internal_addr, u16 data) static inline void TLan_DioWrite16(u16 base_addr, u16 internal_addr, u16 data)
{ {
outw(internal_addr, base_addr + TLAN_DIO_ADR); outw(internal_addr, base_addr + TLAN_DIO_ADR);
outw(data, base_addr + TLAN_DIO_DATA + (internal_addr & 0x2)); outw(data, base_addr + TLAN_DIO_DATA + (internal_addr & 0x2));
...@@ -493,7 +493,7 @@ inline void TLan_DioWrite16(u16 base_addr, u16 internal_addr, u16 data) ...@@ -493,7 +493,7 @@ inline void TLan_DioWrite16(u16 base_addr, u16 internal_addr, u16 data)
inline void TLan_DioWrite32(u16 base_addr, u16 internal_addr, u32 data) static inline void TLan_DioWrite32(u16 base_addr, u16 internal_addr, u32 data)
{ {
outw(internal_addr, base_addr + TLAN_DIO_ADR); outw(internal_addr, base_addr + TLAN_DIO_ADR);
outl(data, base_addr + TLAN_DIO_DATA + (internal_addr & 0x2)); outl(data, base_addr + TLAN_DIO_DATA + (internal_addr & 0x2));
...@@ -503,7 +503,7 @@ inline void TLan_DioWrite32(u16 base_addr, u16 internal_addr, u32 data) ...@@ -503,7 +503,7 @@ inline void TLan_DioWrite32(u16 base_addr, u16 internal_addr, u32 data)
#if 0 #if 0
inline void TLan_ClearBit(u8 bit, u16 port) static inline void TLan_ClearBit(u8 bit, u16 port)
{ {
outb_p(inb_p(port) & ~bit, port); outb_p(inb_p(port) & ~bit, port);
} }
...@@ -511,7 +511,7 @@ inline void TLan_ClearBit(u8 bit, u16 port) ...@@ -511,7 +511,7 @@ inline void TLan_ClearBit(u8 bit, u16 port)
inline int TLan_GetBit(u8 bit, u16 port) static inline int TLan_GetBit(u8 bit, u16 port)
{ {
return ((int) (inb_p(port) & bit)); return ((int) (inb_p(port) & bit));
} }
...@@ -519,7 +519,7 @@ inline int TLan_GetBit(u8 bit, u16 port) ...@@ -519,7 +519,7 @@ inline int TLan_GetBit(u8 bit, u16 port)
inline void TLan_SetBit(u8 bit, u16 port) static inline void TLan_SetBit(u8 bit, u16 port)
{ {
outb_p(inb_p(port) | bit, port); outb_p(inb_p(port) | bit, port);
} }
...@@ -532,7 +532,7 @@ inline void TLan_SetBit(u8 bit, u16 port) ...@@ -532,7 +532,7 @@ inline void TLan_SetBit(u8 bit, u16 port)
#ifdef I_LIKE_A_FAST_HASH_FUNCTION #ifdef I_LIKE_A_FAST_HASH_FUNCTION
/* given 6 bytes, view them as 8 6-bit numbers and return the XOR of those */ /* given 6 bytes, view them as 8 6-bit numbers and return the XOR of those */
/* the code below is about seven times as fast as the original code */ /* the code below is about seven times as fast as the original code */
inline u32 TLan_HashFunc( u8 *a ) static inline u32 TLan_HashFunc( u8 *a )
{ {
u8 hash; u8 hash;
...@@ -548,14 +548,14 @@ inline u32 TLan_HashFunc( u8 *a ) ...@@ -548,14 +548,14 @@ inline u32 TLan_HashFunc( u8 *a )
#else /* original code */ #else /* original code */
inline u32 xor( u32 a, u32 b ) static inline u32 xor( u32 a, u32 b )
{ {
return ( ( a && ! b ) || ( ! a && b ) ); return ( ( a && ! b ) || ( ! a && b ) );
} }
#define XOR8( a, b, c, d, e, f, g, h ) xor( a, xor( b, xor( c, xor( d, xor( e, xor( f, xor( g, h ) ) ) ) ) ) ) #define XOR8( a, b, c, d, e, f, g, h ) xor( a, xor( b, xor( c, xor( d, xor( e, xor( f, xor( g, h ) ) ) ) ) ) )
#define DA( a, bit ) ( ( (u8) a[bit/8] ) & ( (u8) ( 1 << bit%8 ) ) ) #define DA( a, bit ) ( ( (u8) a[bit/8] ) & ( (u8) ( 1 << bit%8 ) ) )
inline u32 TLan_HashFunc( u8 *a ) static inline u32 TLan_HashFunc( u8 *a )
{ {
u32 hash; u32 hash;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment