diff options
| author | Alan <alan@lxorguk.ukuu.org.uk> | 2007-02-20 13:15:03 -0500 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2007-02-25 15:41:40 -0500 |
| commit | 616ece2e7e5363574d172d64b19ffe9535606a1b (patch) | |
| tree | 41ca4f5a76ab9a8846b445250cc92339874c8824 | |
| parent | cc70991d64e767729c37278cd4f80f709556079a (diff) | |
libata: Use new id_to_dma_mode function to tidy reporting in more drivers (minimally tested)
Signed-off-by: Alan Cox <alan@redhat.com>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
| -rw-r--r-- | drivers/ata/ata_generic.c | 4 | ||||
| -rw-r--r-- | drivers/ata/pata_it821x.c | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/drivers/ata/ata_generic.c b/drivers/ata/ata_generic.c index be66ea08da55..7649039cc6a9 100644 --- a/drivers/ata/ata_generic.c +++ b/drivers/ata/ata_generic.c | |||
| @@ -90,10 +90,10 @@ static int generic_set_mode(struct ata_port *ap, struct ata_device **unused) | |||
| 90 | /* We do need the right mode information for DMA or PIO | 90 | /* We do need the right mode information for DMA or PIO |
| 91 | and this comes from the current configuration flags */ | 91 | and this comes from the current configuration flags */ |
| 92 | if (dma_enabled & (1 << (5 + i))) { | 92 | if (dma_enabled & (1 << (5 + i))) { |
| 93 | dev->xfer_mode = XFER_MW_DMA_0; | 93 | ata_id_to_dma_mode(dev, XFER_MW_DMA_0); |
| 94 | dev->xfer_shift = ATA_SHIFT_MWDMA; | ||
| 95 | dev->flags &= ~ATA_DFLAG_PIO; | 94 | dev->flags &= ~ATA_DFLAG_PIO; |
| 96 | } else { | 95 | } else { |
| 96 | ata_dev_printk(dev, KERN_INFO, "configured for PIO\n"); | ||
| 97 | dev->xfer_mode = XFER_PIO_0; | 97 | dev->xfer_mode = XFER_PIO_0; |
| 98 | dev->xfer_shift = ATA_SHIFT_PIO; | 98 | dev->xfer_shift = ATA_SHIFT_PIO; |
| 99 | dev->flags |= ATA_DFLAG_PIO; | 99 | dev->flags |= ATA_DFLAG_PIO; |
diff --git a/drivers/ata/pata_it821x.c b/drivers/ata/pata_it821x.c index 73394c75be42..bab4511c5e5d 100644 --- a/drivers/ata/pata_it821x.c +++ b/drivers/ata/pata_it821x.c | |||
| @@ -503,10 +503,12 @@ static int it821x_smart_set_mode(struct ata_port *ap, struct ata_device **unused | |||
| 503 | /* We do need the right mode information for DMA or PIO | 503 | /* We do need the right mode information for DMA or PIO |
| 504 | and this comes from the current configuration flags */ | 504 | and this comes from the current configuration flags */ |
| 505 | if (dma_enabled & (1 << (5 + i))) { | 505 | if (dma_enabled & (1 << (5 + i))) { |
| 506 | ata_dev_printk(dev, KERN_INFO, "configured for DMA\n"); | ||
| 506 | dev->xfer_mode = XFER_MW_DMA_0; | 507 | dev->xfer_mode = XFER_MW_DMA_0; |
| 507 | dev->xfer_shift = ATA_SHIFT_MWDMA; | 508 | dev->xfer_shift = ATA_SHIFT_MWDMA; |
| 508 | dev->flags &= ~ATA_DFLAG_PIO; | 509 | dev->flags &= ~ATA_DFLAG_PIO; |
| 509 | } else { | 510 | } else { |
| 511 | ata_dev_printk(dev, KERN_INFO, "configured for PIO\n"); | ||
| 510 | dev->xfer_mode = XFER_PIO_0; | 512 | dev->xfer_mode = XFER_PIO_0; |
| 511 | dev->xfer_shift = ATA_SHIFT_PIO; | 513 | dev->xfer_shift = ATA_SHIFT_PIO; |
| 512 | dev->flags |= ATA_DFLAG_PIO; | 514 | dev->flags |= ATA_DFLAG_PIO; |