From patchwork Tue Aug 25 14:58:11 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alan Cox X-Patchwork-Id: 32051 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@bilbo.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from ozlabs.org (ozlabs.org [203.10.76.45]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client CN "mx.ozlabs.org", Issuer "CA Cert Signing Authority" (verified OK)) by bilbo.ozlabs.org (Postfix) with ESMTPS id 30C5EB7BC5 for ; Wed, 26 Aug 2009 01:03:58 +1000 (EST) Received: by ozlabs.org (Postfix) id 2571FDDDB2; Wed, 26 Aug 2009 01:03:58 +1000 (EST) Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by ozlabs.org (Postfix) with ESMTP id 8CBADDDDA2 for ; Wed, 26 Aug 2009 01:03:57 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755319AbZHYPDe (ORCPT ); Tue, 25 Aug 2009 11:03:34 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1755321AbZHYPDd (ORCPT ); Tue, 25 Aug 2009 11:03:33 -0400 Received: from earthlight.etchedpixels.co.uk ([81.2.110.250]:42580 "EHLO bob.linux.org.uk" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1755320AbZHYPDd (ORCPT ); Tue, 25 Aug 2009 11:03:33 -0400 Received: from localhost.localdomain (localhost [127.0.0.1]) by bob.linux.org.uk (8.14.3/8.14.3) with ESMTP id n7PEwBcG016337; Tue, 25 Aug 2009 15:58:11 +0100 From: Alan Cox Subject: [PATCH 05/26] et131x: kill refcount To: greg@kroah.com, netdev@vger.kernel.org Date: Tue, 25 Aug 2009 15:58:11 +0100 Message-ID: <20090825145804.16176.38223.stgit@localhost.localdomain> In-Reply-To: <20090825145619.16176.68780.stgit@localhost.localdomain> References: <20090825145619.16176.68780.stgit@localhost.localdomain> User-Agent: StGIT/0.14.3 MIME-Version: 1.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org 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 --- drivers/staging/et131x/et1310_pm.c | 2 -- drivers/staging/et131x/et1310_rx.c | 7 ------- drivers/staging/et131x/et131x_adapter.h | 4 ---- 3 files changed, 0 insertions(+), 13 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/drivers/staging/et131x/et1310_pm.c b/drivers/staging/et131x/et1310_pm.c index a507411..848d6b0 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) spin_unlock_irqrestore(&etdev->SendHWLock, flags); /* Wait for outstanding Receive packets */ - while ((MP_GET_RCV_REF(etdev) != 0) && (LoopCounter-- > 0)) - mdelay(2); /* Gate off JAGCore 3 clock domains */ GlobalPmCSR.bits.pm_sysclk_gate = 0; diff --git a/drivers/staging/et131x/et1310_rx.c b/drivers/staging/et131x/et1310_rx.c index b05b8c5..6423552 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) * Besides, we don't really need (at this point) the * pending list anyway. */ - /* spin_lock_irqsave( &etdev->RcvPendLock, flags ); - * list_add_tail( &pMpRfd->list_node, &etdev->RxRing.RecvPendingList ); - * spin_unlock_irqrestore( &etdev->RcvPendLock, flags ); - */ - - /* Update the number of outstanding Recvs */ - /* MP_INC_RCV_REF( etdev ); */ } else { RFDFreeArray[PacketFreeCount] = pMpRfd; PacketFreeCount++; diff --git a/drivers/staging/et131x/et131x_adapter.h b/drivers/staging/et131x/et131x_adapter.h index 82686ea..04de4ff 100644 --- a/drivers/staging/et131x/et131x_adapter.h +++ b/drivers/staging/et131x/et131x_adapter.h @@ -108,8 +108,6 @@ #define MP_TEST_FLAGS(_M, _F) (((_M)->Flags & (_F)) == (_F)) #define MP_IS_FLAG_CLEAR(_M, _F) (((_M)->Flags & (_F)) == 0) -#define MP_GET_RCV_REF(_A) atomic_read(&(_A)->RcvRefCount) - /* Macros specific to the private adapter structure */ #define MP_TCB_RESOURCES_AVAILABLE(_M) ((_M)->TxRing.nBusySend < NUM_TCB) #define MP_TCB_RESOURCES_NOT_AVAILABLE(_M) ((_M)->TxRing.nBusySend >= NUM_TCB) @@ -311,8 +309,6 @@ struct et131x_adapter { MP_POWER_MGMT PoMgmt; INTERRUPT_t CachedMaskValue; - atomic_t RcvRefCount; /* Num packets not yet returned */ - /* Xcvr status at last poll */ MI_BMSR_t Bmsr;