From patchwork Tue Feb 8 12:23:53 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bartlomiej Zolnierkiewicz X-Patchwork-Id: 82322 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.180.67]) by ozlabs.org (Postfix) with ESMTP id EA50EB70CD for ; Tue, 8 Feb 2011 23:28:17 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752203Ab1BHMYG (ORCPT ); Tue, 8 Feb 2011 07:24:06 -0500 Received: from mail-ew0-f46.google.com ([209.85.215.46]:61026 "EHLO mail-ew0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752600Ab1BHMYE (ORCPT ); Tue, 8 Feb 2011 07:24:04 -0500 Received: by ewy5 with SMTP id 5so2881584ewy.19 for ; Tue, 08 Feb 2011 04:24:03 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:from:to:cc:date:message-id:in-reply-to :references:subject; bh=mvJlJ4OkC2wMHVm56BTU5ReiEu5/pIU7KOkz10NlILw=; b=CPgDBemL+QY+slvoLEdG/slz4P/tmuOtGI+IkUnd5dU2vO7wCOz2THQEtUt0eIFfvm mDyv51VPl2XQtsKBI0OVR536oebqU77oAi4YVslaNnaDQwej1V6e4BG0pyAiWm6F+y/7 F7GBJZejfyEJmzi3F95xiZs5pRvqLPw6yPvfo= 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=edB6rq2NJP+B266+4NWD0ekqQUoy3MvegUkCywkZMC5IkpDxPLtXQ0CDM2vszD4JbM rXJLFNzMrJ2C6ddBslpjfRcK2TiBp0vEzL9+XLjt1uihoeUJ4td90k0gykOQNHo9F9WK w3xJdyqa0oEbsOIrlNe0Xld45t1Td9sHzg510= Received: by 10.213.36.15 with SMTP id r15mr12546019ebd.86.1297167843129; Tue, 08 Feb 2011 04:24:03 -0800 (PST) Received: from linux-mhg7.site (89-74-121-163.dynamic.chello.pl [89.74.121.163]) by mx.google.com with ESMTPS id b52sm3961895eei.7.2011.02.08.04.24.01 (version=TLSv1/SSLv3 cipher=RC4-MD5); Tue, 08 Feb 2011 04:24:01 -0800 (PST) From: Bartlomiej Zolnierkiewicz To: linux-ide@vger.kernel.org Cc: Bartlomiej Zolnierkiewicz , linux-kernel@vger.kernel.org Date: Tue, 08 Feb 2011 13:23:53 +0100 Message-Id: <20110208122353.19110.75537.sendpatchset@linux-mhg7.site> In-Reply-To: <20110208122314.19110.4092.sendpatchset@linux-mhg7.site> References: <20110208122314.19110.4092.sendpatchset@linux-mhg7.site> Subject: [PATCH 03/20] pata_efar: fix register naming used in efar_set_piomode() Sender: linux-ide-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-ide@vger.kernel.org From efbad2a0611e47772c8696a2c5b2037c78554378 Mon Sep 17 00:00:00 2001 From: Bartlomiej Zolnierkiewicz Date: Tue, 8 Feb 2011 12:39:25 +0100 Subject: [PATCH 03/20] pata_efar: fix register naming used in efar_set_piomode() Rename 'idetm_port' and 'idetm_data' variables to 'master_port' and 'master_data' respectively to match register naming used in efar_set_dma_mode() and in ata_piix.c. Fix efar_set_piomode() documentation and 'master_port' type while at it. Signed-off-by: Bartlomiej Zolnierkiewicz --- drivers/ata/pata_efar.c | 22 +++++++++++----------- 1 files changed, 11 insertions(+), 11 deletions(-) diff --git a/drivers/ata/pata_efar.c b/drivers/ata/pata_efar.c index a088347..afe92b7 100644 --- a/drivers/ata/pata_efar.c +++ b/drivers/ata/pata_efar.c @@ -73,7 +73,7 @@ static DEFINE_SPINLOCK(efar_lock); /** * efar_set_piomode - Initialize host controller PATA PIO timings * @ap: Port whose timings we are configuring - * @adev: um + * @adev: Device to program * * Set PIO mode for device, in host controller PCI config space. * @@ -85,9 +85,9 @@ static void efar_set_piomode (struct ata_port *ap, struct ata_device *adev) { unsigned int pio = adev->pio_mode - XFER_PIO_0; struct pci_dev *dev = to_pci_dev(ap->host->dev); - unsigned int idetm_port= ap->port_no ? 0x42 : 0x40; unsigned long flags; - u16 idetm_data; + u8 master_port = ap->port_no ? 0x42 : 0x40; + u16 master_data; u8 udma_enable; int control = 0; @@ -113,20 +113,20 @@ static void efar_set_piomode (struct ata_port *ap, struct ata_device *adev) spin_lock_irqsave(&efar_lock, flags); - pci_read_config_word(dev, idetm_port, &idetm_data); + pci_read_config_word(dev, master_port, &master_data); /* Set PPE, IE, and TIME as appropriate */ if (adev->devno == 0) { - idetm_data &= 0xCCF0; - idetm_data |= control; - idetm_data |= (timings[pio][0] << 12) | + master_data &= 0xCCF0; + master_data |= control; + master_data |= (timings[pio][0] << 12) | (timings[pio][1] << 8); } else { int shift = 4 * ap->port_no; u8 slave_data; - idetm_data &= 0xFF0F; - idetm_data |= (control << 4); + master_data &= 0xFF0F; + master_data |= (control << 4); /* Slave timing in separate register */ pci_read_config_byte(dev, 0x44, &slave_data); @@ -135,8 +135,8 @@ static void efar_set_piomode (struct ata_port *ap, struct ata_device *adev) pci_write_config_byte(dev, 0x44, slave_data); } - idetm_data |= 0x4000; /* Ensure SITRE is set */ - pci_write_config_word(dev, idetm_port, idetm_data); + master_data |= 0x4000; /* Ensure SITRE is set */ + pci_write_config_word(dev, master_port, master_data); pci_read_config_byte(dev, 0x48, &udma_enable); udma_enable &= ~(1 << (2 * ap->port_no + adev->devno));