Commit 80922fbc authored by Amit S. Kale's avatar Amit S. Kale Committed by Jeff Garzik
Browse files

[PATCH] NetXen: whitespace cleaup and more cleanup fixes 



Signed-off-by: default avatarAmit S. Kale <amitkale@netxen.com>

 netxen_nic.h         |   56 ++++++++++++++++++++--------------------------
 netxen_nic_ethtool.c |   53 +++++++++++++++++++++-----------------------
 netxen_nic_hdr.h     |    6 ++---
 netxen_nic_hw.c      |   54 +++++++++++++++++++++------------------------
 netxen_nic_hw.h      |   10 ++++----
 netxen_nic_init.c    |   61 +++++++++++++++++++++++++--------------------------
 netxen_nic_ioctl.h   |    6 ++---
 netxen_nic_isr.c     |   48 +++++++++++++++++-----------------------
 netxen_nic_main.c    |   54 +++++++++++++++++----------------------------
 netxen_nic_niu.c     |   10 ++++----
 10 files changed, 165 insertions(+), 193 deletions(-)
Signed-off-by: default avatarJeff Garzik <jeff@garzik.org>
parent 59dc76a4

drivers/net/netxen/netxen_nic.h

+25 −31
Original line number Diff line number Diff line
@@ -90,7 +90,7 @@ 
 * To use NETXEN_CRB_NORMALIZE, window _must_ be set to 1

 */

#define NETXEN_CRB_NORMAL(reg)	\

	(reg) - NETXEN_CRB_PCIX_HOST2 + NETXEN_CRB_PCIX_HOST

	((reg) - NETXEN_CRB_PCIX_HOST2 + NETXEN_CRB_PCIX_HOST)



#define NETXEN_CRB_NORMALIZE(adapter, reg) \

	pci_base_offset(adapter, NETXEN_CRB_NORMAL(reg))
@@ -164,7 +164,7 @@ enum { 


#define MAX_CMD_DESCRIPTORS		1024

#define MAX_RCV_DESCRIPTORS		32768

#define MAX_JUMBO_RCV_DESCRIPTORS	1024

#define MAX_JUMBO_RCV_DESCRIPTORS	4096

#define MAX_RCVSTATUS_DESCRIPTORS	MAX_RCV_DESCRIPTORS

#define MAX_JUMBO_RCV_DESC	MAX_JUMBO_RCV_DESCRIPTORS

#define MAX_RCV_DESC		MAX_RCV_DESCRIPTORS
@@ -559,7 +559,7 @@ typedef enum { 
#define PRIMARY_START 		(BOOTLD_START)

#define FLASH_CRBINIT_SIZE 	(0x4000)

#define FLASH_BRDCFG_SIZE 	(sizeof(struct netxen_board_info))

#define FLASH_USER_SIZE		(sizeof(netxen_user_info)/sizeof(u32))

#define FLASH_USER_SIZE		(sizeof(struct netxen_user_info)/sizeof(u32))

#define FLASH_SECONDARY_SIZE 	(USER_START-SECONDARY_START)

#define NUM_PRIMARY_SECTORS	(0x20)

#define NUM_CONFIG_SECTORS 	(1)
@@ -572,7 +572,7 @@ typedef enum { 
#else

#define DPRINTK(klevel, fmt, args...)	do { \

	printk(KERN_##klevel PFX "%s: %s: " fmt, __FUNCTION__,\

		(adapter != NULL && adapter->port != NULL && \

		(adapter != NULL && \

		adapter->port[0] != NULL && \

		adapter->port[0]->netdev != NULL) ? \

		adapter->port[0]->netdev->name : NULL, \
@@ -703,8 +703,6 @@ struct netxen_recv_context { 


#define NETXEN_NIC_MSI_ENABLED 0x02



struct netxen_drvops;



struct netxen_adapter {

	struct netxen_hardware_context ahw;

	int port_count;		/* Number of configured ports  */
@@ -746,8 +744,21 @@ struct netxen_adapter { 
	struct netxen_recv_context recv_ctx[MAX_RCV_CTX];



	int is_up;

	int work_done;

	struct netxen_drvops *ops;

	int (*enable_phy_interrupts) (struct netxen_adapter *, int);

	int (*disable_phy_interrupts) (struct netxen_adapter *, int);

	void (*handle_phy_intr) (struct netxen_adapter *);

	int (*macaddr_set) (struct netxen_port *, netxen_ethernet_macaddr_t);

	int (*set_mtu) (struct netxen_port *, int);

	int (*set_promisc) (struct netxen_adapter *, int,

			    netxen_niu_prom_mode_t);

	int (*unset_promisc) (struct netxen_adapter *, int,

			      netxen_niu_prom_mode_t);

	int (*phy_read) (struct netxen_adapter *, long phy, long reg, u32 *);

	int (*phy_write) (struct netxen_adapter *, long phy, long reg, u32 val);

	int (*init_port) (struct netxen_adapter *, int);

	void (*init_niu) (struct netxen_adapter *);

	int (*stop_port) (struct netxen_adapter *, int);



};				/* netxen_adapter structure */



/* Max number of xmit producer threads that can run simultaneously */
@@ -829,23 +840,6 @@ static inline void __iomem *pci_base(struct netxen_adapter *adapter, 
	return NULL;

}



struct netxen_drvops {

	int (*enable_phy_interrupts) (struct netxen_adapter *, int);

	int (*disable_phy_interrupts) (struct netxen_adapter *, int);

	void (*handle_phy_intr) (struct netxen_adapter *);

	int (*macaddr_set) (struct netxen_port *, netxen_ethernet_macaddr_t);

	int (*set_mtu) (struct netxen_port *, int);

	int (*set_promisc) (struct netxen_adapter *, int,

			    netxen_niu_prom_mode_t);

	int (*unset_promisc) (struct netxen_adapter *, int,

			      netxen_niu_prom_mode_t);

	int (*phy_read) (struct netxen_adapter *, long phy, long reg, u32 *);

	int (*phy_write) (struct netxen_adapter *, long phy, long reg, u32 val);

	int (*init_port) (struct netxen_adapter *, int);

	void (*init_niu) (struct netxen_adapter *);

	int (*stop_port) (struct netxen_adapter *, int);

};



extern char netxen_nic_driver_name[];



int netxen_niu_xgbe_enable_phy_interrupts(struct netxen_adapter *adapter,

drivers/net/netxen/netxen_nic_ethtool.c

+26 −27
Original line number Diff line number Diff line
@@ -118,7 +118,7 @@ netxen_nic_get_drvinfo(struct net_device *dev, struct ethtool_drvinfo *drvinfo) 
	u32 fw_minor = 0;

	u32 fw_build = 0;



	strncpy(drvinfo->driver, "netxen_nic", 32);

	strncpy(drvinfo->driver, netxen_nic_driver_name, 32);

	strncpy(drvinfo->version, NETXEN_NIC_LINUX_VERSIONID, 32);

	fw_major = readl(NETXEN_CRB_NORMALIZE(adapter,

					      NETXEN_FW_VERSION_MAJOR));
@@ -210,7 +210,6 @@ netxen_nic_get_settings(struct net_device *dev, struct ethtool_cmd *ecmd) 
		printk(KERN_ERR "netxen-nic: Unsupported board model %d\n",

		       (netxen_brdtype_t) boardinfo->board_type);

		return -EIO;



	}



	return 0;
@@ -226,16 +225,16 @@ netxen_nic_set_settings(struct net_device *dev, struct ethtool_cmd *ecmd) 
	/* read which mode */

	if (adapter->ahw.board_type == NETXEN_NIC_GBE) {

		/* autonegotiation */

		if (adapter->ops->phy_write

		    && adapter->ops->phy_write(adapter, port->portnum,

		if (adapter->phy_write

		    && adapter->phy_write(adapter, port->portnum,

					  NETXEN_NIU_GB_MII_MGMT_ADDR_AUTONEG,

					  (__le32) ecmd->autoneg) != 0)

			return -EIO;

		else

			port->link_autoneg = ecmd->autoneg;



		if (adapter->ops->phy_read

		    && adapter->ops->phy_read(adapter, port->portnum,

		if (adapter->phy_read

		    && adapter->phy_read(adapter, port->portnum,

					 NETXEN_NIU_GB_MII_MGMT_ADDR_PHY_STATUS,

					 &status) != 0)

			return -EIO;
@@ -257,8 +256,8 @@ netxen_nic_set_settings(struct net_device *dev, struct ethtool_cmd *ecmd) 
			netxen_clear_phy_duplex(status);

		if (ecmd->duplex == DUPLEX_FULL)

			netxen_set_phy_duplex(status);

		if (adapter->ops->phy_write

		    && adapter->ops->phy_write(adapter, port->portnum,

		if (adapter->phy_write

		    && adapter->phy_write(adapter, port->portnum,

					  NETXEN_NIU_GB_MII_MGMT_ADDR_PHY_STATUS,

					  *((int *)&status)) != 0)

			return -EIO;
@@ -422,8 +421,8 @@ static u32 netxen_nic_get_link(struct net_device *dev) 


	/* read which mode */

	if (adapter->ahw.board_type == NETXEN_NIC_GBE) {

		if (adapter->ops->phy_read

		    && adapter->ops->phy_read(adapter, port->portnum,

		if (adapter->phy_read

		    && adapter->phy_read(adapter, port->portnum,

					 NETXEN_NIU_GB_MII_MGMT_ADDR_PHY_STATUS,

					 &status) != 0)

			return -EIO;
@@ -526,8 +525,8 @@ netxen_nic_set_pauseparam(struct net_device *dev, 
				    *(u32 *) (&val));

		/* set autoneg */

		autoneg = pause->autoneg;

		if (adapter->ops->phy_write

		    && adapter->ops->phy_write(adapter, port->portnum,

		if (adapter->phy_write

		    && adapter->phy_write(adapter, port->portnum,

					  NETXEN_NIU_GB_MII_MGMT_ADDR_AUTONEG,

					  (__le32) autoneg) != 0)

			return -EIO;

drivers/net/netxen/netxen_nic_hw.c

+26 −28
Original line number Diff line number Diff line
@@ -81,8 +81,8 @@ int netxen_nic_set_mac(struct net_device *netdev, void *p) 
	DPRINTK(INFO, "valid ether addr\n");

	memcpy(netdev->dev_addr, addr->sa_data, netdev->addr_len);



	if (adapter->ops->macaddr_set)

		adapter->ops->macaddr_set(port, addr->sa_data);

	if (adapter->macaddr_set)

		adapter->macaddr_set(port, addr->sa_data);



	return 0;

}
@@ -99,15 +99,15 @@ void netxen_nic_set_multi(struct net_device *netdev) 


	mc_ptr = netdev->mc_list;

	if (netdev->flags & IFF_PROMISC) {

		if (adapter->ops->set_promisc)

			adapter->ops->set_promisc(adapter,

		if (adapter->set_promisc)

			adapter->set_promisc(adapter,

					     port->portnum,

					     NETXEN_NIU_PROMISC_MODE);

	} else {

		if (adapter->ops->unset_promisc &&

		if (adapter->unset_promisc &&

		    adapter->ahw.boardcfg.board_type

		    != NETXEN_BRDTYPE_P2_SB31_10G_IMEZ)

			adapter->ops->unset_promisc(adapter,

			adapter->unset_promisc(adapter,

					       port->portnum,

					       NETXEN_NIU_NON_PROMISC_MODE);

	}
@@ -160,8 +160,8 @@ int netxen_nic_change_mtu(struct net_device *netdev, int mtu) 
		return -EINVAL;

	}



	if (adapter->ops->set_mtu)

		adapter->ops->set_mtu(port, mtu);

	if (adapter->set_mtu)

		adapter->set_mtu(port, mtu);

	netdev->mtu = mtu;



	return 0;
@@ -184,14 +184,12 @@ int netxen_nic_hw_resources(struct netxen_adapter *adapter) 
	struct netxen_recv_context *recv_ctx;

	struct netxen_rcv_desc_ctx *rcv_desc;



	DPRINTK(INFO, "crb_base: %lx %lx", NETXEN_PCI_CRBSPACE,

	DPRINTK(INFO, "crb_base: %lx %x", NETXEN_PCI_CRBSPACE,

		PCI_OFFSET_SECOND_RANGE(adapter, NETXEN_PCI_CRBSPACE));

	DPRINTK(INFO, "cam base: %lx %lx", NETXEN_CRB_CAM,

	DPRINTK(INFO, "cam base: %lx %x", NETXEN_CRB_CAM,

		pci_base_offset(adapter, NETXEN_CRB_CAM));

	DPRINTK(INFO, "cam RAM: %lx %lx", NETXEN_CAM_RAM_BASE,

	DPRINTK(INFO, "cam RAM: %lx %x", NETXEN_CAM_RAM_BASE,

		pci_base_offset(adapter, NETXEN_CAM_RAM_BASE));

	DPRINTK(INFO, "NIC base:%lx %lx\n", NIC_CRB_BASE_PORT1,

		pci_base_offset(adapter, NIC_CRB_BASE_PORT1));



	/* Window 1 call */

	card_cmdring = readl(NETXEN_CRB_NORMALIZE(adapter, CRB_CMDPEG_CMDRING));
@@ -648,7 +646,7 @@ void netxen_nic_reg_write(struct netxen_adapter *adapter, u64 off, u32 val) 


	addr = NETXEN_CRB_NORMALIZE(adapter, off);

	DPRINTK(INFO, "writing to base %lx offset %llx addr %p data %x\n",

		pci_base(adapter, off), off, addr);

		pci_base(adapter, off), off, addr, val);

	writel(val, addr);



}
@@ -660,7 +658,7 @@ int netxen_nic_reg_read(struct netxen_adapter *adapter, u64 off) 


	addr = NETXEN_CRB_NORMALIZE(adapter, off);

	DPRINTK(INFO, "reading from base %lx offset %llx addr %p\n",

		adapter->ahw.pci_base, off, addr);

		pci_base(adapter, off), off, addr);

	val = readl(addr);

	writel(val, addr);
@@ -848,8 +846,8 @@ void netxen_nic_stop_all_ports(struct netxen_adapter *adapter) 


	for (port_nr = 0; port_nr < adapter->ahw.max_ports; port_nr++) {

		port = adapter->port[port_nr];

		if (adapter->ops->stop_port)

			adapter->ops->stop_port(adapter, port->portnum);

		if (adapter->stop_port)

			adapter->stop_port(adapter, port->portnum);

	}

}
@@ -878,8 +876,8 @@ void netxen_nic_set_link_parameters(struct netxen_port *port) 


	netxen_nic_read_w0(adapter, NETXEN_NIU_MODE, &mode);

	if (netxen_get_niu_enable_ge(mode)) {	/* Gb 10/100/1000 Mbps mode */

		if (adapter->ops->phy_read

		    && adapter->ops->

		if (adapter->phy_read

		    && adapter->

		    phy_read(adapter, port->portnum,

			     NETXEN_NIU_GB_MII_MGMT_ADDR_PHY_STATUS,

			     &status) == 0) {
@@ -909,8 +907,8 @@ void netxen_nic_set_link_parameters(struct netxen_port *port) 
					port->link_duplex = -1;

					break;

				}

				if (adapter->ops->phy_read

				    && adapter->ops->

				if (adapter->phy_read

				    && adapter->

				    phy_read(adapter, port->portnum,

					     NETXEN_NIU_GB_MII_MGMT_ADDR_AUTONEG,

					     (__le32 *) & autoneg) != 0)

drivers/net/netxen/netxen_nic_hw.h

+5 −5
Original line number Diff line number Diff line
@@ -83,8 +83,8 @@ struct netxen_adapter; 
#define NETXEN_PCI_MAPSIZE_BYTES  (NETXEN_PCI_MAPSIZE << 20)



#define NETXEN_NIC_LOCKED_READ_REG(X, Y)	\

	addr = pci_base_offset(adapter, (X));	\

	*(u32 *)Y = readl(addr);

	addr = pci_base_offset(adapter, X);	\

	*(u32 *)Y = readl((void __iomem*) addr);



struct netxen_port;

void netxen_nic_set_link_parameters(struct netxen_port *port);

drivers/net/netxen/netxen_nic_init.c

+30 −31
Original line number Diff line number Diff line
@@ -212,37 +212,36 @@ void netxen_initialize_adapter_hw(struct netxen_adapter *adapter) 


void netxen_initialize_adapter_ops(struct netxen_adapter *adapter)

{

	struct netxen_drvops *ops = adapter->ops;

	switch (adapter->ahw.board_type) {

	case NETXEN_NIC_GBE:

		ops->enable_phy_interrupts =

		adapter->enable_phy_interrupts =

		    netxen_niu_gbe_enable_phy_interrupts;

		ops->disable_phy_interrupts =

		adapter->disable_phy_interrupts =

		    netxen_niu_gbe_disable_phy_interrupts;

		ops->handle_phy_intr = netxen_nic_gbe_handle_phy_intr;

		ops->macaddr_set = netxen_niu_macaddr_set;

		ops->set_mtu = netxen_nic_set_mtu_gb;

		ops->set_promisc = netxen_niu_set_promiscuous_mode;

		ops->unset_promisc = netxen_niu_set_promiscuous_mode;

		ops->phy_read = netxen_niu_gbe_phy_read;

		ops->phy_write = netxen_niu_gbe_phy_write;

		ops->init_port = netxen_niu_gbe_init_port;

		ops->init_niu = netxen_nic_init_niu_gb;

		ops->stop_port = netxen_niu_disable_gbe_port;

		adapter->handle_phy_intr = netxen_nic_gbe_handle_phy_intr;

		adapter->macaddr_set = netxen_niu_macaddr_set;

		adapter->set_mtu = netxen_nic_set_mtu_gb;

		adapter->set_promisc = netxen_niu_set_promiscuous_mode;

		adapter->unset_promisc = netxen_niu_set_promiscuous_mode;

		adapter->phy_read = netxen_niu_gbe_phy_read;

		adapter->phy_write = netxen_niu_gbe_phy_write;

		adapter->init_port = netxen_niu_gbe_init_port;

		adapter->init_niu = netxen_nic_init_niu_gb;

		adapter->stop_port = netxen_niu_disable_gbe_port;

		break;



	case NETXEN_NIC_XGBE:

		ops->enable_phy_interrupts =

		adapter->enable_phy_interrupts =

		    netxen_niu_xgbe_enable_phy_interrupts;

		ops->disable_phy_interrupts =

		adapter->disable_phy_interrupts =

		    netxen_niu_xgbe_disable_phy_interrupts;

		ops->handle_phy_intr = netxen_nic_xgbe_handle_phy_intr;

		ops->macaddr_set = netxen_niu_xg_macaddr_set;

		ops->set_mtu = netxen_nic_set_mtu_xgb;

		ops->init_port = netxen_niu_xg_init_port;

		ops->set_promisc = netxen_niu_xg_set_promiscuous_mode;

		ops->unset_promisc = netxen_niu_xg_set_promiscuous_mode;

		ops->stop_port = netxen_niu_disable_xg_port;

		adapter->handle_phy_intr = netxen_nic_xgbe_handle_phy_intr;

		adapter->macaddr_set = netxen_niu_xg_macaddr_set;

		adapter->set_mtu = netxen_nic_set_mtu_xgb;

		adapter->init_port = netxen_niu_xg_init_port;

		adapter->set_promisc = netxen_niu_xg_set_promiscuous_mode;

		adapter->unset_promisc = netxen_niu_xg_set_promiscuous_mode;

		adapter->stop_port = netxen_niu_disable_xg_port;

		break;



	default:
@@ -383,8 +382,8 @@ int netxen_rom_wip_poll(struct netxen_adapter *adapter) 
	return 0;

}



static inline int do_rom_fast_write(struct netxen_adapter *adapter,

				    int addr, int data)

static inline int do_rom_fast_write(struct netxen_adapter *adapter, int addr,

				    int data)

{

	if (netxen_rom_wren(adapter)) {

		return -1;
@@ -734,8 +733,8 @@ void netxen_watchdog_task(unsigned long v) 
			netif_wake_queue(netdev);

	}



	if (adapter->ops->handle_phy_intr)

		adapter->ops->handle_phy_intr(adapter);

	if (adapter->handle_phy_intr)

		adapter->handle_phy_intr(adapter);

	mod_timer(&adapter->watchdog_timer, jiffies + 2 * HZ);

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE