staging: wlags49_h2: remove useless DbgHwAddr() method

There is no needs to prepare string for MAC addresses beforehand, due to
kernel's *printf() have '%pM' format option.

Signed-off-by: Andy Shevchenko <andy.shevchenko@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

1 files changed, 43 insertions, 30 deletions

diff --git a/drivers/staging/wlags49_h2/wl_main.c b/drivers/staging/wlags49_h2/wl_main.c
index 10a4709..00758aa 100644
--- a/drivers/staging/wlags49_h2/wl_main.c
+++ b/drivers/staging/wlags49_h2/wl_main.c
@@ -485,7 +485,10 @@ int wl_insert( struct net_device *dev )
 //;?        DBG_PARAM( DbgInfo, PARM_NAME_CREATE_IBSS, "\"%s\"", PARM_CREATE_IBSS );
 //;?        DBG_PARAM( DbgInfo, PARM_NAME_MULTICAST_RX, "\"%s\"", PARM_MULTICAST_RX );
 //;?        DBG_PARAM( DbgInfo, PARM_NAME_MAX_SLEEP, "%d", PARM_MAX_SLEEP );
-//;?        DBG_PARAM( DbgInfo, PARM_NAME_NETWORK_ADDR, "\"%s\"", DbgHwAddr( PARM_NETWORK_ADDR ));
+/*
+	DBG_PARAM(DbgInfo, PARM_NAME_NETWORK_ADDR, "\"%pM\"",
+			PARM_NETWORK_ADDR);
+ */
 //;?        DBG_PARAM( DbgInfo, PARM_NAME_AUTHENTICATION, "%d", PARM_AUTHENTICATION );
 //;?        DBG_PARAM( DbgInfo, PARM_NAME_OWN_ATIM_WINDOW, "%d", PARM_OWN_ATIM_WINDOW );
 //;?        DBG_PARAM( DbgInfo, PARM_NAME_PM_HOLDOVER_DURATION, "%d", PARM_PM_HOLDOVER_DURATION );
@@ -512,12 +515,18 @@ int wl_insert( struct net_device *dev )
 	DBG_PARAM( DbgInfo, PARM_NAME_TX_RATE4, "%d", PARM_TX_RATE4 );
 	DBG_PARAM( DbgInfo, PARM_NAME_TX_RATE5, "%d", PARM_TX_RATE5 );
 	DBG_PARAM( DbgInfo, PARM_NAME_TX_RATE6, "%d", PARM_TX_RATE6 );
-	DBG_PARAM( DbgInfo, PARM_NAME_WDS_ADDRESS1, "\"%s\"", DbgHwAddr( PARM_WDS_ADDRESS1 ));
-	DBG_PARAM( DbgInfo, PARM_NAME_WDS_ADDRESS2, "\"%s\"", DbgHwAddr( PARM_WDS_ADDRESS2 ));
-	DBG_PARAM( DbgInfo, PARM_NAME_WDS_ADDRESS3, "\"%s\"", DbgHwAddr( PARM_WDS_ADDRESS3 ));
-	DBG_PARAM( DbgInfo, PARM_NAME_WDS_ADDRESS4, "\"%s\"", DbgHwAddr( PARM_WDS_ADDRESS4 ));
-	DBG_PARAM( DbgInfo, PARM_NAME_WDS_ADDRESS5, "\"%s\"", DbgHwAddr( PARM_WDS_ADDRESS5 ));
-	DBG_PARAM( DbgInfo, PARM_NAME_WDS_ADDRESS6, "\"%s\"", DbgHwAddr( PARM_WDS_ADDRESS6 ));
+	DBG_PARAM(DbgInfo, PARM_NAME_WDS_ADDRESS1, "\"%pM\"",
+			PARM_WDS_ADDRESS1);
+	DBG_PARAM(DbgInfo, PARM_NAME_WDS_ADDRESS2, "\"%pM\"",
+			PARM_WDS_ADDRESS2);
+	DBG_PARAM(DbgInfo, PARM_NAME_WDS_ADDRESS3, "\"%pM\"",
+			PARM_WDS_ADDRESS3);
+	DBG_PARAM(DbgInfo, PARM_NAME_WDS_ADDRESS4, "\"%pM\"",
+			PARM_WDS_ADDRESS4);
+	DBG_PARAM(DbgInfo, PARM_NAME_WDS_ADDRESS5, "\"%pM\"",
+			PARM_WDS_ADDRESS5);
+	DBG_PARAM(DbgInfo, PARM_NAME_WDS_ADDRESS6, "\"%pM\"",
+			PARM_WDS_ADDRESS6);
 #endif /* USE_WDS */
 #endif /* HCF_AP */
 
@@ -1189,7 +1198,7 @@ int 			rc;
 		return hcf_status;
 	}
 	memcpy( lp->MACAddress, &lp->ltvRecord.u.u8[0], ETH_ALEN );
-	DBG_TRACE( DbgInfo, "Card MAC Address: %s\n", DbgHwAddr( lp->MACAddress ));
+	DBG_TRACE(DbgInfo, "Card MAC Address: %pM\n", lp->MACAddress);
 
 	/* Write out configuration to the device, enable, and reconnect. However,
 	   only reconnect if in AP mode. For STA mode, need to wait for passive scan
@@ -1940,8 +1949,10 @@ int wl_put_ltv( struct wl_private *lp )
 	}
 
 	/* Own MAC Address */
-	//DBG_TRACE( DbgInfo, "MAC Address                       : %s\n",
-	//           DbgHwAddr( lp->MACAddress ));
+/*
+	DBG_TRACE(DbgInfo, "MAC Address                       : %pM\n",
+			lp->MACAddress);
+ */
 
 	if ( WVLAN_VALID_MAC_ADDRESS( lp->MACAddress )) {
 		/* Make the MAC address valid by:
@@ -3052,8 +3063,8 @@ void wl_process_mailbox( struct wl_private *lp )
 						   aps[num_aps].capability );
 				DBG_TRACE( DbgInfo, "SSID Length     : 0x%04x\n",
 						   aps[num_aps].ssid_len );
-				DBG_TRACE( DbgInfo, "BSSID           : %s\n",
-						   DbgHwAddr( aps[num_aps].bssid ));
+				DBG_TRACE(DbgInfo, "BSSID           : %pM\n",
+						   aps[num_aps].bssid);
 
 				if ( aps[num_aps].ssid_len != 0 ) {
 					DBG_TRACE( DbgInfo, "SSID            : %s.\n",
@@ -3112,29 +3123,29 @@ void wl_process_mailbox( struct wl_private *lp )
 				DBG_TRACE( DbgInfo, "(%s) durID       : 0x%04x.\n",
 						   lp->dev->name, probe_rsp->durID );
 
-				DBG_TRACE( DbgInfo, "(%s) address1    : %s\n",
-						   lp->dev->name, DbgHwAddr( probe_rsp->address1 ));
+				DBG_TRACE(DbgInfo, "(%s) address1    : %pM\n",
+					lp->dev->name, probe_rsp->address1);
 
-				DBG_TRACE( DbgInfo, "(%s) address2    : %s\n",
-						   lp->dev->name, DbgHwAddr( probe_rsp->address2 ));
+				DBG_TRACE(DbgInfo, "(%s) address2    : %pM\n",
+					lp->dev->name, probe_rsp->address2);
 
-				DBG_TRACE( DbgInfo, "(%s) BSSID       : %s\n",
-						   lp->dev->name, DbgHwAddr( probe_rsp->BSSID ));
+				DBG_TRACE(DbgInfo, "(%s) BSSID       : %pM\n",
+					lp->dev->name, probe_rsp->BSSID);
 
 				DBG_TRACE( DbgInfo, "(%s) sequence    : 0x%04x.\n",
 						   lp->dev->name, probe_rsp->sequence );
 
-				DBG_TRACE( DbgInfo, "(%s) address4    : %s\n",
-						   lp->dev->name, DbgHwAddr( probe_rsp->address4 ));
+				DBG_TRACE(DbgInfo, "(%s) address4    : %pM\n",
+					lp->dev->name, probe_rsp->address4);
 
 				DBG_TRACE( DbgInfo, "(%s) datalength  : 0x%04x.\n",
 						   lp->dev->name, probe_rsp->dataLength );
 
-				DBG_TRACE( DbgInfo, "(%s) DA          : %s\n",
-						   lp->dev->name, DbgHwAddr( probe_rsp->DA ));
+				DBG_TRACE(DbgInfo, "(%s) DA          : %pM\n",
+					lp->dev->name, probe_rsp->DA);
 
-				DBG_TRACE( DbgInfo, "(%s) SA          : %s\n",
-						   lp->dev->name, DbgHwAddr( probe_rsp->SA ));
+				DBG_TRACE(DbgInfo, "(%s) SA          : %pM\n",
+					lp->dev->name, probe_rsp->SA);
 
 				//DBG_TRACE( DbgInfo, "(%s) lenType     : 0x%04x.\n",
 				//           lp->dev->name, probe_rsp->lenType );
@@ -3302,12 +3313,12 @@ void wl_process_mailbox( struct wl_private *lp )
 				break;
 			}
 
-			DBG_TRACE( DbgInfo, "STA Address        : %s\n",
-					   DbgHwAddr( as->staAddr ));
+			DBG_TRACE(DbgInfo, "STA Address        : %pM\n",
+					   as->staAddr);
 
 			if (( as->assocStatus == 2 )  && ( as->len == 8 )) {
-				DBG_TRACE( DbgInfo, "Old AP Address     : %s\n",
-						   DbgHwAddr( as->oldApAddr ));
+				DBG_TRACE(DbgInfo, "Old AP Address     : %pM\n",
+						   as->oldApAddr);
 			}
 		}
 
@@ -3346,9 +3357,11 @@ void wl_process_mailbox( struct wl_private *lp )
 				break;
 			}
 
-			DBG_TRACE( DbgInfo, "STA Address     : %s\n", DbgHwAddr( ss->staAddr ));
+			DBG_TRACE(DbgInfo, "STA Address     : %pM\n",
+					ss->staAddr);
 
-			DBG_TRACE( DbgInfo, "Reason          : 0x%04x \n", ss->reason );
+			DBG_TRACE(DbgInfo, "Reason          : 0x%04x\n",
+					ss->reason);
 		}
 
 		break;