aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorAlan Cox <alan@linux.intel.com>2009-08-27 05:58:49 -0400
committerGreg Kroah-Hartman <gregkh@suse.de>2009-09-15 15:02:26 -0400
commitbf1aa8e1befc9eadd6911773494e59f563d01ebe (patch)
treef501997541052411285b4cac89ae5ce7c0afdf5d /drivers
parent649050894d75f374bf263d2c6046f9743e4276fb (diff)
Staging et131x: kill refcount
The RefCount field is accessed only by a macro and the only use of it in the tree is to read it, so it can go Signed-off-by: Alan Cox <alan@linux.intel.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/staging/et131x/et1310_pm.c2
-rw-r--r--drivers/staging/et131x/et1310_rx.c7
-rw-r--r--drivers/staging/et131x/et131x_adapter.h4
3 files changed, 0 insertions, 13 deletions
diff --git a/drivers/staging/et131x/et1310_pm.c b/drivers/staging/et131x/et1310_pm.c
index a50741168f62..848d6b0a1ec7 100644
--- a/drivers/staging/et131x/et1310_pm.c
+++ b/drivers/staging/et131x/et1310_pm.c
@@ -139,8 +139,6 @@ void EnablePhyComa(struct et131x_adapter *etdev)
139 spin_unlock_irqrestore(&etdev->SendHWLock, flags); 139 spin_unlock_irqrestore(&etdev->SendHWLock, flags);
140 140
141 /* Wait for outstanding Receive packets */ 141 /* Wait for outstanding Receive packets */
142 while ((MP_GET_RCV_REF(etdev) != 0) && (LoopCounter-- > 0))
143 mdelay(2);
144 142
145 /* Gate off JAGCore 3 clock domains */ 143 /* Gate off JAGCore 3 clock domains */
146 GlobalPmCSR.bits.pm_sysclk_gate = 0; 144 GlobalPmCSR.bits.pm_sysclk_gate = 0;
diff --git a/drivers/staging/et131x/et1310_rx.c b/drivers/staging/et131x/et1310_rx.c
index b05b8c50d072..6423552b37c2 100644
--- a/drivers/staging/et131x/et1310_rx.c
+++ b/drivers/staging/et131x/et1310_rx.c
@@ -1258,13 +1258,6 @@ void et131x_handle_recv_interrupt(struct et131x_adapter *etdev)
1258 * Besides, we don't really need (at this point) the 1258 * Besides, we don't really need (at this point) the
1259 * pending list anyway. 1259 * pending list anyway.
1260 */ 1260 */
1261 /* spin_lock_irqsave( &etdev->RcvPendLock, flags );
1262 * list_add_tail( &pMpRfd->list_node, &etdev->RxRing.RecvPendingList );
1263 * spin_unlock_irqrestore( &etdev->RcvPendLock, flags );
1264 */
1265
1266 /* Update the number of outstanding Recvs */
1267 /* MP_INC_RCV_REF( etdev ); */
1268 } else { 1261 } else {
1269 RFDFreeArray[PacketFreeCount] = pMpRfd; 1262 RFDFreeArray[PacketFreeCount] = pMpRfd;
1270 PacketFreeCount++; 1263 PacketFreeCount++;
diff --git a/drivers/staging/et131x/et131x_adapter.h b/drivers/staging/et131x/et131x_adapter.h
index 82686eaf4297..04de4ff3e874 100644
--- a/drivers/staging/et131x/et131x_adapter.h
+++ b/drivers/staging/et131x/et131x_adapter.h
@@ -108,8 +108,6 @@
108#define MP_TEST_FLAGS(_M, _F) (((_M)->Flags & (_F)) == (_F)) 108#define MP_TEST_FLAGS(_M, _F) (((_M)->Flags & (_F)) == (_F))
109#define MP_IS_FLAG_CLEAR(_M, _F) (((_M)->Flags & (_F)) == 0) 109#define MP_IS_FLAG_CLEAR(_M, _F) (((_M)->Flags & (_F)) == 0)
110 110
111#define MP_GET_RCV_REF(_A) atomic_read(&(_A)->RcvRefCount)
112
113/* Macros specific to the private adapter structure */ 111/* Macros specific to the private adapter structure */
114#define MP_TCB_RESOURCES_AVAILABLE(_M) ((_M)->TxRing.nBusySend < NUM_TCB) 112#define MP_TCB_RESOURCES_AVAILABLE(_M) ((_M)->TxRing.nBusySend < NUM_TCB)
115#define MP_TCB_RESOURCES_NOT_AVAILABLE(_M) ((_M)->TxRing.nBusySend >= NUM_TCB) 113#define MP_TCB_RESOURCES_NOT_AVAILABLE(_M) ((_M)->TxRing.nBusySend >= NUM_TCB)
@@ -311,8 +309,6 @@ struct et131x_adapter {
311 MP_POWER_MGMT PoMgmt; 309 MP_POWER_MGMT PoMgmt;
312 INTERRUPT_t CachedMaskValue; 310 INTERRUPT_t CachedMaskValue;
313 311
314 atomic_t RcvRefCount; /* Num packets not yet returned */
315
316 /* Xcvr status at last poll */ 312 /* Xcvr status at last poll */
317 MI_BMSR_t Bmsr; 313 MI_BMSR_t Bmsr;
318 314