diff options
| author | Mithlesh Thukral <mithlesh@linsyssoft.com> | 2009-01-30 20:20:19 +0530 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2009-04-03 14:53:11 -0700 |
| commit | 559990c6885d988605e247981234a29ba0b2b2c9 (patch) | |
| tree | 48357b7ecd37e8e21847564be14e17b1879d8d9e /drivers/staging/sxg | |
| parent | b62a294f97be4072171189510f34bb545364395e (diff) | |
| download | talos-obmc-linux-559990c6885d988605e247981234a29ba0b2b2c9.tar.gz talos-obmc-linux-559990c6885d988605e247981234a29ba0b2b2c9.zip | |
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>
Diffstat (limited to 'drivers/staging/sxg')
| -rw-r--r-- | drivers/staging/sxg/sxg.c | 23 | ||||
| -rw-r--r-- | drivers/staging/sxg/sxg_ethtool.c | 12 |
2 files changed, 3 insertions, 32 deletions
diff --git a/drivers/staging/sxg/sxg.c b/drivers/staging/sxg/sxg.c index 500e30ce3bde..990ad561736f 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); #if XXXTODO static int sxg_mac_set_address(struct net_device *dev, void *ptr); -static void sxg_unmap_mmio_space(struct adapter_t *adapter); #endif static void sxg_mcast_set_list(struct net_device *dev); @@ -3218,35 +3217,17 @@ static void sxg_mcast_set_list(struct net_device *dev) struct adapter_t *adapter = (struct adapter_t *) netdev_priv(dev); ASSERT(adapter); - if (dev->flags & IFF_PROMISC) { + if (dev->flags & IFF_PROMISC) adapter->MacFilter |= MAC_PROMISC; - } - if (dev->flags & IFF_MULTICAST) adapter->MacFilter |= MAC_MCAST; - - if (dev->flags & IFF_ALLMULTI) { + if (dev->flags & IFF_ALLMULTI) adapter->MacFilter |= MAC_ALLMCAST; - } //XXX handle other flags as well sxg_set_mcast_addr(adapter); } -#if XXXTODO -static void sxg_unmap_mmio_space(struct adapter_t *adapter) -{ -#if LINUX_FREES_ADAPTER_RESOURCES -/* - * if (adapter->Regs) { - * iounmap(adapter->Regs); - * } - * adapter->slic_regs = NULL; - */ -#endif -} -#endif - void sxg_free_sgl_buffers(struct adapter_t *adapter) { struct list_entry *ple; diff --git a/drivers/staging/sxg/sxg_ethtool.c b/drivers/staging/sxg/sxg_ethtool.c index 63d12580e695..8c710f428974 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) switch(stringset) { case ETH_SS_TEST: - /* return -EOPNOTSUPP; */ break; case ETH_SS_STATS: for (index = 0; index < SXG_NIC_STATS_LEN; index++) { @@ -257,14 +256,6 @@ static void sxg_nic_get_regs(struct net_device *netdev, memcpy((buff+sizeof(struct sxg_hw_regs)), UcodeRegs, sizeof(struct sxg_ucode_regs)); } -static void sxg_nic_get_wol(struct net_device *netdev, - struct ethtool_wolinfo *wol) -{ - /* We dont support wake-on-lan */ - wol->supported = 0; - memset(&wol->sopass, 0, sizeof(wol->sopass)); -} - static int sxg_nic_get_eeprom_len(struct net_device *netdev) { return (USER_VIEWABLE_EEPROM_SIZE); @@ -315,10 +306,9 @@ struct ethtool_ops sxg_nic_ethtool_ops = { .get_regs_len = sxg_nic_get_regs_len, .get_regs = sxg_nic_get_regs, .get_link = ethtool_op_get_link, - .get_wol = sxg_nic_get_wol, +// .get_wol = sxg_nic_get_wol, .get_eeprom_len = sxg_nic_get_eeprom_len, .get_eeprom = sxg_nic_get_eeprom, -// .get_ringparam = sxg_nic_get_ringparam, // .get_pauseparam = sxg_nic_get_pauseparam, // .set_pauseparam = sxg_nic_set_pauseparam, .set_tx_csum = ethtool_op_set_tx_csum, |
