diff options
author | Amit S. Kale <amitkale@netxen.com> | 2006-12-01 08:36:22 -0500 |
---|---|---|
committer | Jeff Garzik <jeff@garzik.org> | 2006-12-02 00:33:11 -0500 |
commit | 71bd7877d470b4037c9ef0d060ac39228f0f6289 (patch) | |
tree | 89e740bb45b1841f145bbc78cba34ce884c9fca8 /drivers/net/netxen/netxen_nic_hw.c | |
parent | e8a2b6a4207332a2d59628a12cece9e8c1d769e4 (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_hw.c')
-rw-r--r-- | drivers/net/netxen/netxen_nic_hw.c | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/drivers/net/netxen/netxen_nic_hw.c b/drivers/net/netxen/netxen_nic_hw.c index 99e647a5ae76..105c24f0ad4c 100644 --- a/drivers/net/netxen/netxen_nic_hw.c +++ b/drivers/net/netxen/netxen_nic_hw.c | |||
@@ -275,10 +275,8 @@ int netxen_nic_hw_resources(struct netxen_adapter *adapter) | |||
275 | rcv_desc->desc_head = (struct rcv_desc *)addr; | 275 | rcv_desc->desc_head = (struct rcv_desc *)addr; |
276 | } | 276 | } |
277 | 277 | ||
278 | addr = netxen_alloc(adapter->ahw.pdev, | 278 | addr = netxen_alloc(adapter->ahw.pdev, STATUS_DESC_RINGSIZE, |
279 | STATUS_DESC_RINGSIZE, | 279 | &recv_ctx->rcv_status_desc_phys_addr, |
280 | &recv_ctx-> | ||
281 | rcv_status_desc_phys_addr, | ||
282 | &recv_ctx->rcv_status_desc_pdev); | 280 | &recv_ctx->rcv_status_desc_pdev); |
283 | if (addr == NULL) { | 281 | if (addr == NULL) { |
284 | DPRINTK(ERR, "bad return from" | 282 | DPRINTK(ERR, "bad return from" |
@@ -675,7 +673,7 @@ void netxen_nic_write_w0(struct netxen_adapter *adapter, u32 index, u32 value) | |||
675 | void __iomem *addr; | 673 | void __iomem *addr; |
676 | 674 | ||
677 | netxen_nic_pci_change_crbwindow(adapter, 0); | 675 | netxen_nic_pci_change_crbwindow(adapter, 0); |
678 | addr = (void __iomem *)(pci_base_offset(adapter, index)); | 676 | addr = pci_base_offset(adapter, index); |
679 | writel(value, addr); | 677 | writel(value, addr); |
680 | netxen_nic_pci_change_crbwindow(adapter, 1); | 678 | netxen_nic_pci_change_crbwindow(adapter, 1); |
681 | } | 679 | } |
@@ -685,7 +683,7 @@ void netxen_nic_read_w0(struct netxen_adapter *adapter, u32 index, u32 * value) | |||
685 | { | 683 | { |
686 | void __iomem *addr; | 684 | void __iomem *addr; |
687 | 685 | ||
688 | addr = (void __iomem *)(pci_base_offset(adapter, index)); | 686 | addr = pci_base_offset(adapter, index); |
689 | 687 | ||
690 | netxen_nic_pci_change_crbwindow(adapter, 0); | 688 | netxen_nic_pci_change_crbwindow(adapter, 0); |
691 | *value = readl(addr); | 689 | *value = readl(addr); |
@@ -865,7 +863,7 @@ netxen_crb_writelit_adapter(struct netxen_adapter *adapter, unsigned long off, | |||
865 | writel(data, NETXEN_CRB_NORMALIZE(adapter, off)); | 863 | writel(data, NETXEN_CRB_NORMALIZE(adapter, off)); |
866 | } else { | 864 | } else { |
867 | netxen_nic_pci_change_crbwindow(adapter, 0); | 865 | netxen_nic_pci_change_crbwindow(adapter, 0); |
868 | addr = (void __iomem *)(pci_base_offset(adapter, off)); | 866 | addr = pci_base_offset(adapter, off); |
869 | writel(data, addr); | 867 | writel(data, addr); |
870 | netxen_nic_pci_change_crbwindow(adapter, 1); | 868 | netxen_nic_pci_change_crbwindow(adapter, 1); |
871 | } | 869 | } |