From patchwork Tue Aug 25 14:59:12 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alan Cox X-Patchwork-Id: 32056 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 23F09B7BB2 for ; Wed, 26 Aug 2009 01:04:58 +1000 (EST) Received: by ozlabs.org (Postfix) id 18D15DDDD3; Wed, 26 Aug 2009 01:04: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 8F30EDDDA2 for ; Wed, 26 Aug 2009 01:04:57 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755328AbZHYPEf (ORCPT ); Tue, 25 Aug 2009 11:04:35 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1755326AbZHYPEf (ORCPT ); Tue, 25 Aug 2009 11:04:35 -0400 Received: from earthlight.etchedpixels.co.uk ([81.2.110.250]:42601 "EHLO bob.linux.org.uk" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1755296AbZHYPEe (ORCPT ); Tue, 25 Aug 2009 11:04:34 -0400 Received: from localhost.localdomain (localhost [127.0.0.1]) by bob.linux.org.uk (8.14.3/8.14.3) with ESMTP id n7PExCvQ016416; Tue, 25 Aug 2009 15:59:12 +0100 From: Alan Cox Subject: [PATCH 10/26] et131x: Eliminate RegistryDMA Cache To: greg@kroah.com, netdev@vger.kernel.org Date: Tue, 25 Aug 2009 15:59:12 +0100 Message-ID: <20090825145902.16176.32883.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 One writer, of a constant, one user .. it can go. Signed-off-by: Alan Cox --- drivers/staging/et131x/et1310_tx.c | 2 +- drivers/staging/et131x/et131x_adapter.h | 1 - drivers/staging/et131x/et131x_config.c | 1 - 3 files changed, 1 insertions(+), 3 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_tx.c b/drivers/staging/et131x/et1310_tx.c index 0dbb824..8e8486a 100644 --- a/drivers/staging/et131x/et1310_tx.c +++ b/drivers/staging/et131x/et1310_tx.c @@ -315,7 +315,7 @@ void et131x_tx_dma_enable(struct et131x_adapter *etdev) */ csr.bits.sngl_epkt_mode = 1; csr.bits.halt = 0; - csr.bits.cache_thrshld = etdev->RegistryDMACache; + csr.bits.cache_thrshld = PARM_DMA_CACHE_DEF; writel(csr.value, &etdev->regs->txdma.csr.value); } diff --git a/drivers/staging/et131x/et131x_adapter.h b/drivers/staging/et131x/et131x_adapter.h index 70a90b8..8e811af 100644 --- a/drivers/staging/et131x/et131x_adapter.h +++ b/drivers/staging/et131x/et131x_adapter.h @@ -271,7 +271,6 @@ struct et131x_adapter { /* Validation helpers */ u8 RegistryPMWOL; u8 RegistryNMIDisable; - u32 RegistryDMACache; u32 RegistrySCGain; u8 RegistryPhyLoopbk; /* Enable Phy loopback */ diff --git a/drivers/staging/et131x/et131x_config.c b/drivers/staging/et131x/et131x_config.c index 499cf75..628d6ad 100644 --- a/drivers/staging/et131x/et131x_config.c +++ b/drivers/staging/et131x/et131x_config.c @@ -265,7 +265,6 @@ void et131x_config_parse(struct et131x_adapter *etdev) else etdev->RegistryNMIDisable = PARM_NMI_DISABLE_DEF; - etdev->RegistryDMACache = PARM_DMA_CACHE_DEF; etdev->RegistryPhyLoopbk = PARM_PHY_LOOPBK_DEF; /* Set the MAC address to a default */