diff options
author | Alan Cox <alan@linux.intel.com> | 2009-08-27 05:58:59 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2009-09-15 15:02:27 -0400 |
commit | 817550815e80ff237439b1631a316bebc3023649 (patch) | |
tree | 04ce70e4bcb979c6196438ae051fc4d98b370ecc | |
parent | bf1aa8e1befc9eadd6911773494e59f563d01ebe (diff) |
Staging: et131x: MPSend macros
Most are unused, one is used and can be replaced with the definition
Signed-off-by: Alan Cox <alan@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-rw-r--r-- | drivers/staging/et131x/et1310_tx.c | 8 | ||||
-rw-r--r-- | drivers/staging/et131x/et131x_adapter.h | 5 |
2 files changed, 4 insertions, 9 deletions
diff --git a/drivers/staging/et131x/et1310_tx.c b/drivers/staging/et131x/et1310_tx.c index a017d271e375..43f5b62ab33b 100644 --- a/drivers/staging/et131x/et1310_tx.c +++ b/drivers/staging/et131x/et1310_tx.c | |||
@@ -1375,7 +1375,7 @@ void et131x_free_busy_send_packets(struct et131x_adapter *etdev) | |||
1375 | DBG_VERBOSE(et131x_dbginfo, "pMpTcb = 0x%p\n", pMpTcb); | 1375 | DBG_VERBOSE(et131x_dbginfo, "pMpTcb = 0x%p\n", pMpTcb); |
1376 | 1376 | ||
1377 | FreeCounter++; | 1377 | FreeCounter++; |
1378 | MP_FREE_SEND_PACKET_FUN(etdev, pMpTcb); | 1378 | et131x_free_send_packet(etdev, pMpTcb); |
1379 | 1379 | ||
1380 | spin_lock_irqsave(&etdev->TCBSendQLock, flags); | 1380 | spin_lock_irqsave(&etdev->TCBSendQLock, flags); |
1381 | 1381 | ||
@@ -1384,7 +1384,7 @@ void et131x_free_busy_send_packets(struct et131x_adapter *etdev) | |||
1384 | 1384 | ||
1385 | if (FreeCounter == NUM_TCB) { | 1385 | if (FreeCounter == NUM_TCB) { |
1386 | DBG_ERROR(et131x_dbginfo, | 1386 | DBG_ERROR(et131x_dbginfo, |
1387 | "MpFreeBusySendPackets exitted loop for a bad reason\n"); | 1387 | "MpFreeBusySendPackets exited loop for a bad reason\n"); |
1388 | BUG(); | 1388 | BUG(); |
1389 | } | 1389 | } |
1390 | 1390 | ||
@@ -1451,7 +1451,7 @@ static void et131x_update_tcb_list(struct et131x_adapter *etdev) | |||
1451 | etdev->TxRing.CurrSendTail = NULL; | 1451 | etdev->TxRing.CurrSendTail = NULL; |
1452 | 1452 | ||
1453 | spin_unlock_irqrestore(&etdev->TCBSendQLock, flags); | 1453 | spin_unlock_irqrestore(&etdev->TCBSendQLock, flags); |
1454 | MP_FREE_SEND_PACKET_FUN(etdev, pMpTcb); | 1454 | et131x_free_send_packet(etdev, pMpTcb); |
1455 | spin_lock_irqsave(&etdev->TCBSendQLock, flags); | 1455 | spin_lock_irqsave(&etdev->TCBSendQLock, flags); |
1456 | 1456 | ||
1457 | /* Goto the next packet */ | 1457 | /* Goto the next packet */ |
@@ -1466,7 +1466,7 @@ static void et131x_update_tcb_list(struct et131x_adapter *etdev) | |||
1466 | etdev->TxRing.CurrSendTail = NULL; | 1466 | etdev->TxRing.CurrSendTail = NULL; |
1467 | 1467 | ||
1468 | spin_unlock_irqrestore(&etdev->TCBSendQLock, flags); | 1468 | spin_unlock_irqrestore(&etdev->TCBSendQLock, flags); |
1469 | MP_FREE_SEND_PACKET_FUN(etdev, pMpTcb); | 1469 | et131x_free_send_packet(etdev, pMpTcb); |
1470 | spin_lock_irqsave(&etdev->TCBSendQLock, flags); | 1470 | spin_lock_irqsave(&etdev->TCBSendQLock, flags); |
1471 | 1471 | ||
1472 | /* Goto the next packet */ | 1472 | /* Goto the next packet */ |
diff --git a/drivers/staging/et131x/et131x_adapter.h b/drivers/staging/et131x/et131x_adapter.h index 04de4ff3e874..df4a625b43ce 100644 --- a/drivers/staging/et131x/et131x_adapter.h +++ b/drivers/staging/et131x/et131x_adapter.h | |||
@@ -333,9 +333,4 @@ struct et131x_adapter { | |||
333 | struct net_device_stats net_stats_prev; | 333 | struct net_device_stats net_stats_prev; |
334 | }; | 334 | }; |
335 | 335 | ||
336 | #define MPSendPacketsHandler MPSendPackets | ||
337 | #define MP_FREE_SEND_PACKET_FUN(Adapter, pMpTcb) \ | ||
338 | et131x_free_send_packet(Adapter, pMpTcb) | ||
339 | #define MpSendPacketFun(Adapter, Packet) MpSendPacket(Adapter, Packet) | ||
340 | |||
341 | #endif /* __ET131X_ADAPTER_H__ */ | 336 | #endif /* __ET131X_ADAPTER_H__ */ |