Skip to content

Commit

Permalink
netxen: trivial register access cleanup
Browse files Browse the repository at this point in the history 
Remove unnecessary length parameter since it's always 4 bytes.

Signed-off-by: Dhananjay Phadke <dhananjay@netxen.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
Dhananjay Phadke authored and David S. Miller committed May 9, 2009
1 parent b0b3a75 commit 23b6cc4
Showing 1 changed file with 5 additions and 8 deletions.
13 changes: 5 additions & 8 deletions drivers/net/netxen/netxen_nic_hw.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -914,17 +914,15 @@ netxen_nic_pci_change_crbwindow_128M(struct netxen_adapter *adapter, u32 wndw)
* In: 'off' is offset from base in 128M pci map
*/
static int
netxen_nic_pci_get_crb_addr_2M(struct netxen_adapter *adapter,
ulong *off, int len)
netxen_nic_pci_get_crb_addr_2M(struct netxen_adapter *adapter, ulong *off)
{
unsigned long end = *off + len;
crb_128M_2M_sub_block_map_t *m;


if (*off >= NETXEN_CRB_MAX)
return -1;

if (*off >= NETXEN_PCI_CAMQM && (end <= NETXEN_PCI_CAMQM_2M_END)) {
if (*off >= NETXEN_PCI_CAMQM && (*off < NETXEN_PCI_CAMQM_2M_END)) {
*off = (*off - NETXEN_PCI_CAMQM) + NETXEN_PCI_CAMQM_2M_BASE +
(ulong)adapter->ahw.pci_base0;
return 0;
Expand All @@ -934,14 +932,13 @@ netxen_nic_pci_get_crb_addr_2M(struct netxen_adapter *adapter,
return -1;

*off -= NETXEN_PCI_CRBSPACE;
end = *off + len;

/*
* Try direct map
*/
m = &crb_128M_2M_map[CRB_BLK(*off)].sub_block[CRB_SUBBLK(*off)];

if (m->valid && (m->start_128M <= *off) && (m->end_128M >= end)) {
if (m->valid && (m->start_128M <= *off) && (m->end_128M > *off)) {
*off = *off + m->start_2M - m->start_128M +
(ulong)adapter->ahw.pci_base0;
return 0;
Expand Down Expand Up @@ -1036,7 +1033,7 @@ netxen_nic_hw_write_wx_2M(struct netxen_adapter *adapter, ulong off, u32 data)
unsigned long flags = 0;
int rv;

rv = netxen_nic_pci_get_crb_addr_2M(adapter, &off, 4);
rv = netxen_nic_pci_get_crb_addr_2M(adapter, &off);

if (rv == -1) {
printk(KERN_ERR "%s: invalid offset: 0x%016lx\n",
Expand Down Expand Up @@ -1066,7 +1063,7 @@ netxen_nic_hw_read_wx_2M(struct netxen_adapter *adapter, ulong off)
int rv;
u32 data;

rv = netxen_nic_pci_get_crb_addr_2M(adapter, &off, 4);
rv = netxen_nic_pci_get_crb_addr_2M(adapter, &off);

if (rv == -1) {
printk(KERN_ERR "%s: invalid offset: 0x%016lx\n",
Expand Down

0 comments on commit 23b6cc4

Please sign in to comment.