8817 ntxn: parameter 'mode_dont_care' set but not used

Reviewed by: Yuri Pankov <yuripv@gmx.com>
Reviewed by: Andrew Stormont <andyjstormont@gmail.com>
Approved by: Hans Rosenfeld <hans.rosenfeld@joyent.com>

3 files changed, 14 insertions, 19 deletions

diff --git a/usr/src/uts/common/io/ntxn/niu.c b/usr/src/uts/common/io/ntxn/niu.c
index 9fd4750f66..0af85aac18 100644
--- a/usr/src/uts/common/io/ntxn/niu.c
+++ b/usr/src/uts/common/io/ntxn/niu.c
@@ -228,9 +228,8 @@ unm_niu_macaddr_set(struct unm_adapter_s *adapter, unm_ethernet_macaddr_t addr)
 }
 
 /* Enable a GbE interface */
-/* ARGSUSED */
-native_t unm_niu_enable_gbe_port(struct unm_adapter_s *adapter,
-		unm_niu_gbe_ifmode_t mode_dont_care)
+native_t
+unm_niu_enable_gbe_port(struct unm_adapter_s *adapter)
 {
 	unm_niu_gb_mac_config_0_t mac_cfg0;
 	unm_niu_gb_mac_config_1_t mac_cfg1;
@@ -240,8 +239,6 @@ native_t unm_niu_enable_gbe_port(struct unm_adapter_s *adapter,
 	int one = 1;
 	u32 port_mode = 0;
 
-	mode_dont_care = 0;
-
 	if ((port < 0) || (port > UNM_NIU_MAX_GBE_PORTS)) {
 		return (-1);
 	}
@@ -251,11 +248,11 @@ native_t unm_niu_enable_gbe_port(struct unm_adapter_s *adapter,
 	    adapter->link_speed != MBPS_1000) {
 
 		if (NX_IS_REVISION_P3(adapter->ahw.revision_id)) {
-/*
- * Do NOT fail this call because the cable is unplugged.
- * Updated when the link comes up...
- */
-		adapter->link_speed = MBPS_1000;
+			/*
+			 * Do NOT fail this call because the cable is unplugged.
+			 * Updated when the link comes up...
+			 */
+			adapter->link_speed = MBPS_1000;
 		} else {
 			return (-1);
 		}
@@ -479,7 +476,7 @@ unm_niu_set_promiscuous_mode(struct unm_adapter_s *adapter,
  */
 int
 unm_niu_xg_macaddr_set(struct unm_adapter_s *adapter,
-		unm_ethernet_macaddr_t addr)
+    unm_ethernet_macaddr_t addr)
 {
 	int		phy = adapter->physical_port;
 	unm_crbword_t	temp = 0;
diff --git a/usr/src/uts/common/io/ntxn/unm_nic.h b/usr/src/uts/common/io/ntxn/unm_nic.h
index b8d3f20a2b..9019e2d584 100644
--- a/usr/src/uts/common/io/ntxn/unm_nic.h
+++ b/usr/src/uts/common/io/ntxn/unm_nic.h
@@ -739,8 +739,7 @@ int unm_niu_xg_macaddr_set(struct unm_adapter_s *adapter,
 native_t unm_niu_disable_xg_port(struct unm_adapter_s *adapter);
 
 long unm_niu_gbe_init_port(long port);
-native_t unm_niu_enable_gbe_port(struct unm_adapter_s *adapter,
-    unm_niu_gbe_ifmode_t mode);
+native_t unm_niu_enable_gbe_port(struct unm_adapter_s *adapter);
 native_t unm_niu_disable_gbe_port(struct unm_adapter_s *adapter);
 
 int unm_niu_macaddr_get(struct unm_adapter_s *adapter, unsigned char *addr);
diff --git a/usr/src/uts/common/io/ntxn/unm_nic_hw.c b/usr/src/uts/common/io/ntxn/unm_nic_hw.c
index bbf13aac05..7a78099ecc 100644
--- a/usr/src/uts/common/io/ntxn/unm_nic_hw.c
+++ b/usr/src/uts/common/io/ntxn/unm_nic_hw.c
@@ -324,7 +324,8 @@ crb_win_lock(struct unm_adapter_s *adapter)
 		/*
 		 *  Yield CPU
 		 */
-		for (i = 0; i < 20; i++);
+		for (i = 0; i < 20; i++)
+			;
 	}
 	adapter->unm_crb_writelit_adapter(adapter, UNM_CRB_WIN_LOCK_ID,
 	    adapter->portnum);
@@ -1904,8 +1905,7 @@ unm_nic_unset_promisc_mode(struct unm_adapter_s *adapter)
 }
 
 long
-unm_nic_phy_read(unm_adapter *adapter, long reg,
-		    __uint32_t *readval)
+unm_nic_phy_read(unm_adapter *adapter, long reg, __uint32_t *readval)
 {
 	long	ret = 0;
 
@@ -1934,21 +1934,20 @@ unm_nic_init_port(struct unm_adapter_s *adapter)
 	long	portnum = adapter->physical_port;
 	long	ret = 0;
 	long	reg = 0;
-	unm_niu_gbe_ifmode_t	mode_dont_care = 0;
 	u32			port_mode = 0;
 
 	unm_nic_set_link_parameters(adapter);
 
 	switch (adapter->ahw.board_type) {
 	case UNM_NIC_GBE:
-		ret = unm_niu_enable_gbe_port(adapter, mode_dont_care);
+		ret = unm_niu_enable_gbe_port(adapter);
 		break;
 
 	case UNM_NIC_XGBE:
 		adapter->unm_nic_hw_read_wx(adapter, UNM_PORT_MODE_ADDR,
 		    &port_mode, 4);
 		if (port_mode == UNM_PORT_MODE_802_3_AP) {
-			ret = unm_niu_enable_gbe_port(adapter, mode_dont_care);
+			ret = unm_niu_enable_gbe_port(adapter);
 		} else {
 			adapter->unm_crb_writelit_adapter(adapter,
 			    UNM_NIU_XGE_CONFIG_0 + (0x10000 * portnum), 0x5);