aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/netxen/netxen_nic_ethtool.c
diff options
context:
space:
mode:
authorAmit S. Kale <amitkale@netxen.com>2006-12-01 08:36:22 -0500
committerJeff Garzik <jeff@garzik.org>2006-12-02 00:33:11 -0500
commit71bd7877d470b4037c9ef0d060ac39228f0f6289 (patch)
tree89e740bb45b1841f145bbc78cba34ce884c9fca8 /drivers/net/netxen/netxen_nic_ethtool.c
parente8a2b6a4207332a2d59628a12cece9e8c1d769e4 (diff)
[PATCH] NetXen: driver cleanup, removed unnecessary __iomem type casts
Signed-off-by: Amit S. Kale <amitkale@netxen.com> netxen_nic.h | 38 ++++++++------------------------------ netxen_nic_ethtool.c | 5 ++--- netxen_nic_hw.c | 12 +++++------- netxen_nic_main.c | 8 +++----- 4 files changed, 18 insertions(+), 45 deletions(-) Signed-off-by: Jeff Garzik <jeff@garzik.org>
Diffstat (limited to 'drivers/net/netxen/netxen_nic_ethtool.c')
-rw-r--r--drivers/net/netxen/netxen_nic_ethtool.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/net/netxen/netxen_nic_ethtool.c b/drivers/net/netxen/netxen_nic_ethtool.c
index f3fc35cf8af7..9a914aeba5bc 100644
--- a/drivers/net/netxen/netxen_nic_ethtool.c
+++ b/drivers/net/netxen/netxen_nic_ethtool.c
@@ -139,8 +139,7 @@ netxen_nic_get_settings(struct net_device *dev, struct ethtool_cmd *ecmd)
139{ 139{
140 struct netxen_port *port = netdev_priv(dev); 140 struct netxen_port *port = netdev_priv(dev);
141 struct netxen_adapter *adapter = port->adapter; 141 struct netxen_adapter *adapter = port->adapter;
142 struct netxen_board_info *boardinfo; 142 struct netxen_board_info *boardinfo = &adapter->ahw.boardcfg;
143 boardinfo = &adapter->ahw.boardcfg;
144 143
145 /* read which mode */ 144 /* read which mode */
146 if (adapter->ahw.board_type == NETXEN_NIC_GBE) { 145 if (adapter->ahw.board_type == NETXEN_NIC_GBE) {
@@ -208,7 +207,7 @@ netxen_nic_get_settings(struct net_device *dev, struct ethtool_cmd *ecmd)
208 ecmd->autoneg = AUTONEG_DISABLE; 207 ecmd->autoneg = AUTONEG_DISABLE;
209 break; 208 break;
210 default: 209 default:
211 printk("ERROR: Unsupported board model %d\n", 210 printk(KERN_ERR "netxen-nic: Unsupported board model %d\n",
212 (netxen_brdtype_t) boardinfo->board_type); 211 (netxen_brdtype_t) boardinfo->board_type);
213 return -EIO; 212 return -EIO;
214 213