aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMithlesh Thukral <mithlesh@linsyssoft.com>2009-01-30 09:50:19 -0500
committerGreg Kroah-Hartman <gregkh@suse.de>2009-04-03 17:53:11 -0400
commit559990c6885d988605e247981234a29ba0b2b2c9 (patch)
tree48357b7ecd37e8e21847564be14e17b1879d8d9e
parentb62a294f97be4072171189510f34bb545364395e (diff)
Staging: sxg: Cleanup the SXG driver of unused space and functions
Miscellaneous cleanups. * Removed unwanted spaces/lines. * Removed unused functions. Signed-off-by: LinSysSoft Sahara Team <saharaproj@linsyssoft.com> Signed-off-by: Mithlesh Thukral <mithlesh@linsyssoft.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-rw-r--r--drivers/staging/sxg/sxg.c23
-rw-r--r--drivers/staging/sxg/sxg_ethtool.c12
2 files changed, 3 insertions, 32 deletions
diff --git a/drivers/staging/sxg/sxg.c b/drivers/staging/sxg/sxg.c
index 500e30ce3bd..990ad561736 100644
--- a/drivers/staging/sxg/sxg.c
+++ b/drivers/staging/sxg/sxg.c
@@ -137,7 +137,6 @@ void sxg_collect_statistics(struct adapter_t *adapter);
137 137
138#if XXXTODO 138#if XXXTODO
139static int sxg_mac_set_address(struct net_device *dev, void *ptr); 139static int sxg_mac_set_address(struct net_device *dev, void *ptr);
140static void sxg_unmap_mmio_space(struct adapter_t *adapter);
141#endif 140#endif
142static void sxg_mcast_set_list(struct net_device *dev); 141static void sxg_mcast_set_list(struct net_device *dev);
143 142
@@ -3218,35 +3217,17 @@ static void sxg_mcast_set_list(struct net_device *dev)
3218 struct adapter_t *adapter = (struct adapter_t *) netdev_priv(dev); 3217 struct adapter_t *adapter = (struct adapter_t *) netdev_priv(dev);
3219 3218
3220 ASSERT(adapter); 3219 ASSERT(adapter);
3221 if (dev->flags & IFF_PROMISC) { 3220 if (dev->flags & IFF_PROMISC)
3222 adapter->MacFilter |= MAC_PROMISC; 3221 adapter->MacFilter |= MAC_PROMISC;
3223 }
3224
3225 if (dev->flags & IFF_MULTICAST) 3222 if (dev->flags & IFF_MULTICAST)
3226 adapter->MacFilter |= MAC_MCAST; 3223 adapter->MacFilter |= MAC_MCAST;
3227 3224 if (dev->flags & IFF_ALLMULTI)
3228 if (dev->flags & IFF_ALLMULTI) {
3229 adapter->MacFilter |= MAC_ALLMCAST; 3225 adapter->MacFilter |= MAC_ALLMCAST;
3230 }
3231 3226
3232 //XXX handle other flags as well 3227 //XXX handle other flags as well
3233 sxg_set_mcast_addr(adapter); 3228 sxg_set_mcast_addr(adapter);
3234} 3229}
3235 3230
3236#if XXXTODO
3237static void sxg_unmap_mmio_space(struct adapter_t *adapter)
3238{
3239#if LINUX_FREES_ADAPTER_RESOURCES
3240/*
3241 * if (adapter->Regs) {
3242 * iounmap(adapter->Regs);
3243 * }
3244 * adapter->slic_regs = NULL;
3245 */
3246#endif
3247}
3248#endif
3249
3250void sxg_free_sgl_buffers(struct adapter_t *adapter) 3231void sxg_free_sgl_buffers(struct adapter_t *adapter)
3251{ 3232{
3252 struct list_entry *ple; 3233 struct list_entry *ple;
diff --git a/drivers/staging/sxg/sxg_ethtool.c b/drivers/staging/sxg/sxg_ethtool.c
index 63d12580e69..8c710f42897 100644
--- a/drivers/staging/sxg/sxg_ethtool.c
+++ b/drivers/staging/sxg/sxg_ethtool.c
@@ -159,7 +159,6 @@ sxg_nic_get_strings(struct net_device *netdev, u32 stringset, u8 * data)
159 159
160 switch(stringset) { 160 switch(stringset) {
161 case ETH_SS_TEST: 161 case ETH_SS_TEST:
162 /* return -EOPNOTSUPP; */
163 break; 162 break;
164 case ETH_SS_STATS: 163 case ETH_SS_STATS:
165 for (index = 0; index < SXG_NIC_STATS_LEN; index++) { 164 for (index = 0; index < SXG_NIC_STATS_LEN; index++) {
@@ -257,14 +256,6 @@ static void sxg_nic_get_regs(struct net_device *netdev,
257 memcpy((buff+sizeof(struct sxg_hw_regs)), UcodeRegs, sizeof(struct sxg_ucode_regs)); 256 memcpy((buff+sizeof(struct sxg_hw_regs)), UcodeRegs, sizeof(struct sxg_ucode_regs));
258} 257}
259 258
260static void sxg_nic_get_wol(struct net_device *netdev,
261 struct ethtool_wolinfo *wol)
262{
263 /* We dont support wake-on-lan */
264 wol->supported = 0;
265 memset(&wol->sopass, 0, sizeof(wol->sopass));
266}
267
268static int sxg_nic_get_eeprom_len(struct net_device *netdev) 259static int sxg_nic_get_eeprom_len(struct net_device *netdev)
269{ 260{
270 return (USER_VIEWABLE_EEPROM_SIZE); 261 return (USER_VIEWABLE_EEPROM_SIZE);
@@ -315,10 +306,9 @@ struct ethtool_ops sxg_nic_ethtool_ops = {
315 .get_regs_len = sxg_nic_get_regs_len, 306 .get_regs_len = sxg_nic_get_regs_len,
316 .get_regs = sxg_nic_get_regs, 307 .get_regs = sxg_nic_get_regs,
317 .get_link = ethtool_op_get_link, 308 .get_link = ethtool_op_get_link,
318 .get_wol = sxg_nic_get_wol, 309// .get_wol = sxg_nic_get_wol,
319 .get_eeprom_len = sxg_nic_get_eeprom_len, 310 .get_eeprom_len = sxg_nic_get_eeprom_len,
320 .get_eeprom = sxg_nic_get_eeprom, 311 .get_eeprom = sxg_nic_get_eeprom,
321// .get_ringparam = sxg_nic_get_ringparam,
322// .get_pauseparam = sxg_nic_get_pauseparam, 312// .get_pauseparam = sxg_nic_get_pauseparam,
323// .set_pauseparam = sxg_nic_set_pauseparam, 313// .set_pauseparam = sxg_nic_set_pauseparam,
324 .set_tx_csum = ethtool_op_set_tx_csum, 314 .set_tx_csum = ethtool_op_set_tx_csum,