From patchwork Wed Nov 25 17:03:37 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bartlomiej Zolnierkiewicz X-Patchwork-Id: 39408 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by ozlabs.org (Postfix) with ESMTP id 960791007DA for ; Thu, 26 Nov 2009 04:28:53 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1759137AbZKYR1e (ORCPT ); Wed, 25 Nov 2009 12:27:34 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1759134AbZKYR1d (ORCPT ); Wed, 25 Nov 2009 12:27:33 -0500 Received: from mail-ew0-f219.google.com ([209.85.219.219]:52887 "EHLO mail-ew0-f219.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1759061AbZKYREP (ORCPT ); Wed, 25 Nov 2009 12:04:15 -0500 Received: by mail-ew0-f219.google.com with SMTP id 19so593484ewy.21 for ; Wed, 25 Nov 2009 09:04:21 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:from:to:cc:date:message-id :in-reply-to:references:subject; bh=P5+awxzpV+3ZJVuWcxlgMoV3RFXIOMpDzKnhV0xPeho=; b=pWZXrF4INCeVEXAKi+b/eNPaHaTBSbP/mtKue1mQ8BUUAvY4aPo9sf5p8cgVhLipGD b3Lb3mfQPxvyeplCExeAwUHRvM5ChyfsYfKR1CuYvSHwKtmt75SQQABeT9QK/KhaETm+ l55uF4GtdCwPPT7WWqIdky8q3oVPd9absX3lI= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=from:to:cc:date:message-id:in-reply-to:references:subject; b=UFNYk/MOTq/PAsIjVW/zQpoFiJfgzTP9+BudJvwQKOXykHLE2+IdWXVKTtZQkQtB9m AaEI0Fb4Ilw/YbGxs/Q2b5UhO5k/JOZDppth2yoIcZhrJOGRNZP4KMuNL31zlp5NTLxE ZeE89ESaNyL2FhVDwj9qtitZLK/dMjkLMfdXI= Received: by 10.216.85.137 with SMTP id u9mr311378wee.214.1259168661238; Wed, 25 Nov 2009 09:04:21 -0800 (PST) Received: from ?127.0.0.1? (chello089079027028.chello.pl [89.79.27.28]) by mx.google.com with ESMTPS id t2sm14631366gve.9.2009.11.25.09.04.19 (version=TLSv1/SSLv3 cipher=RC4-MD5); Wed, 25 Nov 2009 09:04:20 -0800 (PST) From: Bartlomiej Zolnierkiewicz To: linux-ide@vger.kernel.org Cc: Bartlomiej Zolnierkiewicz , linux-kernel@vger.kernel.org Date: Wed, 25 Nov 2009 18:03:37 +0100 Message-Id: <20091125170337.5446.40572.sendpatchset@localhost> In-Reply-To: <20091125170218.5446.13513.sendpatchset@localhost> References: <20091125170218.5446.13513.sendpatchset@localhost> Subject: [PATCH 11/86] pata_atiixp: remove custom BMDMA methods Sender: linux-ide-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-ide@vger.kernel.org From: Bartlomiej Zolnierkiewicz Subject: [PATCH] pata_atiixp: remove custom BMDMA methods Enable/disable UDMA bit only once in ->set_dmamode method and then remove custom ->bmdma_[start,stop] methods. There shouldn't be any problems with it as IDE atiixp host driver has been doing it this way for last two years. Signed-off-by: Bartlomiej Zolnierkiewicz --- drivers/ata/pata_atiixp.c | 58 ++++------------------------------------------ 1 file changed, 6 insertions(+), 52 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe linux-ide" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Index: b/drivers/ata/pata_atiixp.c =================================================================== --- a/drivers/ata/pata_atiixp.c +++ b/drivers/ata/pata_atiixp.c @@ -107,6 +107,9 @@ static void atiixp_set_dmamode(struct at struct pci_dev *pdev = to_pci_dev(ap->host->dev); int dma = adev->dma_mode; int dn = 2 * ap->port_no + adev->devno; + u16 tmp16; + + pci_read_config_word(pdev, ATIIXP_IDE_UDMA_CONTROL, &tmp16); if (adev->dma_mode >= XFER_UDMA_0) { u16 udma_mode_data; @@ -117,6 +120,8 @@ static void atiixp_set_dmamode(struct at udma_mode_data &= ~(0x7 << (4 * dn)); udma_mode_data |= dma << (4 * dn); pci_write_config_word(pdev, ATIIXP_IDE_UDMA_MODE, udma_mode_data); + + tmp16 |= (1 << dn); } else { int timing_shift = (16 * ap->port_no) + 8 * (adev->devno ^ 1); u32 mwdma_timing_data; @@ -129,60 +134,11 @@ static void atiixp_set_dmamode(struct at mwdma_timing_data |= (mwdma_timings[dma] << timing_shift); pci_write_config_dword(pdev, ATIIXP_IDE_MWDMA_TIMING, mwdma_timing_data); - } -} - -/** - * atiixp_bmdma_start - DMA start callback - * @qc: Command in progress - * - * When DMA begins we need to ensure that the UDMA control - * register for the channel is correctly set. - * - * Note: The host lock held by the libata layer protects - * us from two channels both trying to set DMA bits at once - */ - -static void atiixp_bmdma_start(struct ata_queued_cmd *qc) -{ - struct ata_port *ap = qc->ap; - struct ata_device *adev = qc->dev; - - struct pci_dev *pdev = to_pci_dev(ap->host->dev); - int dn = (2 * ap->port_no) + adev->devno; - u16 tmp16; - pci_read_config_word(pdev, ATIIXP_IDE_UDMA_CONTROL, &tmp16); - if (ata_using_udma(adev)) - tmp16 |= (1 << dn); - else tmp16 &= ~(1 << dn); - pci_write_config_word(pdev, ATIIXP_IDE_UDMA_CONTROL, tmp16); - ata_bmdma_start(qc); -} - -/** - * atiixp_dma_stop - DMA stop callback - * @qc: Command in progress - * - * DMA has completed. Clear the UDMA flag as the next operations will - * be PIO ones not UDMA data transfer. - * - * Note: The host lock held by the libata layer protects - * us from two channels both trying to set DMA bits at once - */ - -static void atiixp_bmdma_stop(struct ata_queued_cmd *qc) -{ - struct ata_port *ap = qc->ap; - struct pci_dev *pdev = to_pci_dev(ap->host->dev); - int dn = (2 * ap->port_no) + qc->dev->devno; - u16 tmp16; + } - pci_read_config_word(pdev, ATIIXP_IDE_UDMA_CONTROL, &tmp16); - tmp16 &= ~(1 << dn); pci_write_config_word(pdev, ATIIXP_IDE_UDMA_CONTROL, tmp16); - ata_bmdma_stop(qc); } static struct scsi_host_template atiixp_sht = { @@ -194,8 +150,6 @@ static struct ata_port_operations atiixp .inherits = &ata_bmdma32_port_ops, .qc_prep = ata_sff_dumb_qc_prep, - .bmdma_start = atiixp_bmdma_start, - .bmdma_stop = atiixp_bmdma_stop, .cable_detect = atiixp_cable_detect, .set_piomode = atiixp_set_piomode,