aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/staging/wlags49_h2/wl_util.c
diff options
context:
space:
mode:
authorAndy Shevchenko <andy.shevchenko@gmail.com>2010-10-16 06:11:12 -0400
committerGreg Kroah-Hartman <gregkh@suse.de>2010-10-19 13:04:17 -0400
commit2b6d83d6623dfc4ea036b62b405ce206edfcaa52 (patch)
tree1ed15bad13fdff86cfcef858873c739971cc2fa3 /drivers/staging/wlags49_h2/wl_util.c
parenta113af9a35191901a2be532a7d70ee2dff8ad82d (diff)
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>
Diffstat (limited to 'drivers/staging/wlags49_h2/wl_util.c')
-rw-r--r--drivers/staging/wlags49_h2/wl_util.c70
1 files changed, 17 insertions, 53 deletions
diff --git a/drivers/staging/wlags49_h2/wl_util.c b/drivers/staging/wlags49_h2/wl_util.c
index 4521c9fd5bb..3b6f5a59b2b 100644
--- a/drivers/staging/wlags49_h2/wl_util.c
+++ b/drivers/staging/wlags49_h2/wl_util.c
@@ -315,40 +315,6 @@ void key_string2key( char *ks, KEY_STRCT *key )
315 315
316 316
317 317
318#if DBG
319/*******************************************************************************
320 * DbgHwAddr()
321 *******************************************************************************
322 *
323 * DESCRIPTION:
324 *
325 * Convert a hardware ethernet address to a character string
326 *
327 * PARAMETERS:
328 *
329 * hwAddr - an ethernet address
330 *
331 * RETURNS:
332 *
333 * a pointer to a string representing the ethernet address
334 *
335 ******************************************************************************/
336const char *DbgHwAddr(unsigned char *hwAddr)
337{
338 static char buffer[18];
339 /*------------------------------------------------------------------------*/
340
341 sprintf(buffer, "%pM", hwAddr);
342
343 return buffer;
344} // DbgHwAddr
345/*============================================================================*/
346
347#endif /* DBG */
348
349
350
351
352/******************************************************************************* 318/*******************************************************************************
353 * wl_has_wep() 319 * wl_has_wep()
354 ******************************************************************************* 320 *******************************************************************************
@@ -1132,29 +1098,29 @@ void wl_process_probe_response( struct wl_private *lp )
1132 DBG_TRACE( DbgInfo, "(%s) durID : 0x%04x.\n", lp->dev->name, 1098 DBG_TRACE( DbgInfo, "(%s) durID : 0x%04x.\n", lp->dev->name,
1133 probe_rsp->durID ); 1099 probe_rsp->durID );
1134 1100
1135 DBG_TRACE( DbgInfo, "(%s) address1 : %s\n", lp->dev->name, 1101 DBG_TRACE(DbgInfo, "(%s) address1 : %pM\n", lp->dev->name,
1136 DbgHwAddr( probe_rsp->address1 )); 1102 probe_rsp->address1);
1137 1103
1138 DBG_TRACE( DbgInfo, "(%s) address2 : %s\n", lp->dev->name, 1104 DBG_TRACE(DbgInfo, "(%s) address2 : %pM\n", lp->dev->name,
1139 DbgHwAddr( probe_rsp->address2 )); 1105 probe_rsp->address2);
1140 1106
1141 DBG_TRACE( DbgInfo, "(%s) BSSID : %s\n", lp->dev->name, 1107 DBG_TRACE(DbgInfo, "(%s) BSSID : %pM\n", lp->dev->name,
1142 DbgHwAddr( probe_rsp->BSSID )); 1108 probe_rsp->BSSID);
1143 1109
1144 DBG_TRACE( DbgInfo, "(%s) sequence : 0x%04x.\n", lp->dev->name, 1110 DBG_TRACE( DbgInfo, "(%s) sequence : 0x%04x.\n", lp->dev->name,
1145 probe_rsp->sequence ); 1111 probe_rsp->sequence );
1146 1112
1147 DBG_TRACE( DbgInfo, "(%s) address4 : %s\n", lp->dev->name, 1113 DBG_TRACE(DbgInfo, "(%s) address4 : %pM\n", lp->dev->name,
1148 DbgHwAddr( probe_rsp->address4 )); 1114 probe_rsp->address4);
1149 1115
1150 DBG_TRACE( DbgInfo, "(%s) datalength : 0x%04x.\n", lp->dev->name, 1116 DBG_TRACE( DbgInfo, "(%s) datalength : 0x%04x.\n", lp->dev->name,
1151 probe_rsp->dataLength ); 1117 probe_rsp->dataLength );
1152 1118
1153 DBG_TRACE( DbgInfo, "(%s) DA : %s\n", lp->dev->name, 1119 DBG_TRACE(DbgInfo, "(%s) DA : %pM\n", lp->dev->name,
1154 DbgHwAddr( probe_rsp->DA )); 1120 probe_rsp->DA);
1155 1121
1156 DBG_TRACE( DbgInfo, "(%s) SA : %s\n", lp->dev->name, 1122 DBG_TRACE(DbgInfo, "(%s) SA : %pM\n", lp->dev->name,
1157 DbgHwAddr( probe_rsp->SA )); 1123 probe_rsp->SA);
1158 1124
1159#ifdef WARP 1125#ifdef WARP
1160 1126
@@ -1382,12 +1348,11 @@ void wl_process_assoc_status( struct wl_private *lp )
1382 break; 1348 break;
1383 } 1349 }
1384 1350
1385 DBG_TRACE( DbgInfo, "STA Address : %s\n", 1351 DBG_TRACE(DbgInfo, "STA Address : %pM\n", assoc_stat->staAddr);
1386 DbgHwAddr( assoc_stat->staAddr ));
1387 1352
1388 if(( assoc_stat->assocStatus == 2 ) && ( assoc_stat->len == 8 )) { 1353 if(( assoc_stat->assocStatus == 2 ) && ( assoc_stat->len == 8 )) {
1389 DBG_TRACE( DbgInfo, "Old AP Address : %s\n", 1354 DBG_TRACE(DbgInfo, "Old AP Address : %pM\n",
1390 DbgHwAddr( assoc_stat->oldApAddr )); 1355 assoc_stat->oldApAddr);
1391 } 1356 }
1392 } 1357 }
1393 1358
@@ -1458,9 +1423,8 @@ void wl_process_security_status( struct wl_private *lp )
1458 break; 1423 break;
1459 } 1424 }
1460 1425
1461 DBG_TRACE( DbgInfo, "STA Address : %s\n", 1426 DBG_TRACE(DbgInfo, "STA Address : %pM\n", sec_stat->staAddr);
1462 DbgHwAddr( sec_stat->staAddr )); 1427 DBG_TRACE(DbgInfo, "Reason : 0x%04x\n", sec_stat->reason);
1463 DBG_TRACE( DbgInfo, "Reason : 0x%04x \n", sec_stat->reason );
1464 1428
1465 } 1429 }
1466 1430