Patchwork [2/2] pata_cs5520: use ATA_DMA_* constants

login
register
mail settings
Submitter Sergei Shtylyov
Date Dec. 4, 2009, 8:39 p.m.
Message ID <200912042339.00746.sshtylyov@ru.mvista.com>
Download mbox | patch
Permalink /patch/40365/
State Not Applicable
Delegated to: David Miller
Headers show

Comments

Sergei Shtylyov - Dec. 4, 2009, 8:39 p.m.
Use ATA_DMA_* constants instead of the bare numbers for the BMIDE registers.

Signed-off-by: Sergei Shtylyov <sshtylyov@ru.mvista.com>

---
The patch is against the recent Linus' tree.

 drivers/ata/pata_cs5520.c |    6 +++---
 1 files changed, 3 insertions(+), 3 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
Alan Cox - Dec. 4, 2009, 11:26 p.m.
On Sat, 5 Dec 2009 00:39:00 +0400
Sergei Shtylyov <sshtylyov@ru.mvista.com> wrote:

> Use ATA_DMA_* constants instead of the bare numbers for the BMIDE registers.
> 
> Signed-off-by: Sergei Shtylyov <sshtylyov@ru.mvista.com>

If we are dropping out the virtual DMA support as Bartlomiej proposed
that bit can go completely.

Alan
--
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
Jeff Garzik - Dec. 17, 2009, 6:20 a.m.
On 12/04/2009 03:39 PM, Sergei Shtylyov wrote:
> Use ATA_DMA_* constants instead of the bare numbers for the BMIDE registers.
>
> Signed-off-by: Sergei Shtylyov<sshtylyov@ru.mvista.com>
>
> ---
> The patch is against the recent Linus' tree.
>
>   drivers/ata/pata_cs5520.c |    6 +++---
>   1 files changed, 3 insertions(+), 3 deletions(-)
>
> Index: linux-2.6/drivers/ata/pata_cs5520.c
> ===================================================================
> --- linux-2.6.orig/drivers/ata/pata_cs5520.c
> +++ linux-2.6/drivers/ata/pata_cs5520.c
> @@ -99,9 +99,9 @@ static void cs5520_set_timings(struct at
>   static void cs5520_enable_dma(struct ata_port *ap, struct ata_device *adev)
>   {
>   	/* Set the DMA enable/disable flag */
> -	u8 reg = ioread8(ap->ioaddr.bmdma_addr + 0x02);
> -	reg |= 1<<(adev->devno + 5);
> -	iowrite8(reg, ap->ioaddr.bmdma_addr + 0x02);
> +	u8 reg = ioread8(ap->ioaddr.bmdma_addr + ATA_DMA_STATUS);
> +	reg |= 1<<  (adev->devno + 5);
> +	iowrite8(reg, ap->ioaddr.bmdma_addr + ATA_DMA_STATUS);
>   }

skipped -- Bart's patch (940a68de56c1952c29d9f3c1a769a82b1bdd2b67) 
superceded this


--
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

Patch

Index: linux-2.6/drivers/ata/pata_cs5520.c
===================================================================
--- linux-2.6.orig/drivers/ata/pata_cs5520.c
+++ linux-2.6/drivers/ata/pata_cs5520.c
@@ -99,9 +99,9 @@  static void cs5520_set_timings(struct at
 static void cs5520_enable_dma(struct ata_port *ap, struct ata_device *adev)
 {
 	/* Set the DMA enable/disable flag */
-	u8 reg = ioread8(ap->ioaddr.bmdma_addr + 0x02);
-	reg |= 1<<(adev->devno + 5);
-	iowrite8(reg, ap->ioaddr.bmdma_addr + 0x02);
+	u8 reg = ioread8(ap->ioaddr.bmdma_addr + ATA_DMA_STATUS);
+	reg |= 1 << (adev->devno + 5);
+	iowrite8(reg, ap->ioaddr.bmdma_addr + ATA_DMA_STATUS);
 }
 
 /**