Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 23b6cc42 authored by Dhananjay Phadke's avatar Dhananjay Phadke Committed by David S. Miller
Browse files

netxen: trivial register access cleanup 



Remove unnecessary length parameter since it's always 4 bytes.

Signed-off-by: default avatarDhananjay Phadke <dhananjay@netxen.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent b0b3a75b

drivers/net/netxen/netxen_nic_hw.c

+5 −8
Original line number Diff line number Diff line
@@ -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;
@@ -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;
@@ -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",
@@ -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",