aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@suse.de>2009-01-21 11:17:45 -0500
committerGreg Kroah-Hartman <gregkh@suse.de>2009-04-03 17:53:11 -0400
commit96e7088c9a7ef3a49c8ba9ca660f73744b0b09c5 (patch)
tree71870cdee6c461e01f57e2ca5e07b5c67866c427
parent5774538441aa4255a510ac304d4a3af589cd2c56 (diff)
Staging: sxg: fix build warnings in sxg.c
This compiles out some functions that are not being used to keep the build clean so that we can see the "real" warnings and errors. Cc: Mithlesh Thukral <mithlesh@linsyssoft.com> Cc: LinSysSoft Sahara Team <saharaproj@linsyssoft.com> Cc: Christopher Harrer <charrer@alacritech.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-rw-r--r--drivers/staging/sxg/sxg.c13
1 files changed, 11 insertions, 2 deletions
diff --git a/drivers/staging/sxg/sxg.c b/drivers/staging/sxg/sxg.c
index 74c19b40eed1..06966eed7582 100644
--- a/drivers/staging/sxg/sxg.c
+++ b/drivers/staging/sxg/sxg.c
@@ -133,13 +133,14 @@ void sxg_collect_statistics(struct adapter_t *adapter);
133 133
134#define XXXTODO 0 134#define XXXTODO 0
135 135
136#if XXXTODO
136static int sxg_mac_set_address(struct net_device *dev, void *ptr); 137static int sxg_mac_set_address(struct net_device *dev, void *ptr);
138static void sxg_unmap_mmio_space(struct adapter_t *adapter);
139#endif
137static void sxg_mcast_set_list(struct net_device *dev); 140static void sxg_mcast_set_list(struct net_device *dev);
138 141
139static int sxg_adapter_set_hwaddr(struct adapter_t *adapter); 142static int sxg_adapter_set_hwaddr(struct adapter_t *adapter);
140 143
141static void sxg_unmap_mmio_space(struct adapter_t *adapter);
142
143static int sxg_initialize_adapter(struct adapter_t *adapter); 144static int sxg_initialize_adapter(struct adapter_t *adapter);
144static void sxg_stock_rcv_buffers(struct adapter_t *adapter); 145static void sxg_stock_rcv_buffers(struct adapter_t *adapter);
145static void sxg_complete_descriptor_blocks(struct adapter_t *adapter, 146static void sxg_complete_descriptor_blocks(struct adapter_t *adapter,
@@ -3035,7 +3036,9 @@ static int sxg_read_mdio_reg(struct adapter_t *adapter,
3035 * complemented), we must then transpose the value and return bits 30-23. 3036 * complemented), we must then transpose the value and return bits 30-23.
3036 */ 3037 */
3037static u32 sxg_crc_table[256];/* Table of CRC's for all possible byte values */ 3038static u32 sxg_crc_table[256];/* Table of CRC's for all possible byte values */
3039#if XXXTODO
3038static u32 sxg_crc_init; /* Is table initialized */ 3040static u32 sxg_crc_init; /* Is table initialized */
3041#endif
3039 3042
3040/* Contruct the CRC32 table */ 3043/* Contruct the CRC32 table */
3041static void sxg_mcast_init_crc32(void) 3044static void sxg_mcast_init_crc32(void)
@@ -3060,6 +3063,7 @@ static void sxg_mcast_init_crc32(void)
3060 } 3063 }
3061} 3064}
3062 3065
3066#if XXXTODO
3063/* 3067/*
3064 * Return the MAC hast as described above. 3068 * Return the MAC hast as described above.
3065 */ 3069 */
@@ -3087,6 +3091,7 @@ static unsigned char sxg_mcast_get_mac_hash(char *macaddr)
3087 3091
3088 return (machash); 3092 return (machash);
3089} 3093}
3094#endif
3090 3095
3091static void sxg_mcast_set_mask(struct adapter_t *adapter) 3096static void sxg_mcast_set_mask(struct adapter_t *adapter)
3092{ 3097{
@@ -3130,6 +3135,7 @@ static void sxg_mcast_set_mask(struct adapter_t *adapter)
3130 } 3135 }
3131} 3136}
3132 3137
3138#if XXXTODO
3133/* 3139/*
3134 * Allocate a mcast_address structure to hold the multicast address. 3140 * Allocate a mcast_address structure to hold the multicast address.
3135 * Link it in. 3141 * Link it in.
@@ -3178,6 +3184,7 @@ static void sxg_mcast_set_bit(struct adapter_t *adapter, char *address)
3178 /* OR in the new bit into our 64 bit mask. */ 3184 /* OR in the new bit into our 64 bit mask. */
3179 adapter->MulticastMask |= (u64) 1 << crcpoly; 3185 adapter->MulticastMask |= (u64) 1 << crcpoly;
3180} 3186}
3187#endif
3181 3188
3182static void sxg_mcast_set_list(struct net_device *dev) 3189static void sxg_mcast_set_list(struct net_device *dev)
3183{ 3190{
@@ -3191,6 +3198,7 @@ static void sxg_mcast_set_list(struct net_device *dev)
3191 sxg_mcast_set_mask(adapter); 3198 sxg_mcast_set_mask(adapter);
3192} 3199}
3193 3200
3201#if XXXTODO
3194static void sxg_unmap_mmio_space(struct adapter_t *adapter) 3202static void sxg_unmap_mmio_space(struct adapter_t *adapter)
3195{ 3203{
3196#if LINUX_FREES_ADAPTER_RESOURCES 3204#if LINUX_FREES_ADAPTER_RESOURCES
@@ -3202,6 +3210,7 @@ static void sxg_unmap_mmio_space(struct adapter_t *adapter)
3202 */ 3210 */
3203#endif 3211#endif
3204} 3212}
3213#endif
3205 3214
3206void sxg_free_sgl_buffers(struct adapter_t *adapter) 3215void sxg_free_sgl_buffers(struct adapter_t *adapter)
3207{ 3216{