summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBartlomiej Zolnierkiewicz <bzolnier@gmail.com>2010-01-18 07:20:35 +0000
committerDavid S. Miller <davem@davemloft.net>2010-01-19 01:42:01 -0800
commit3fccaa192b9501e79a57e02e62b6bf420d2b461e (patch)
treefec8af09d6e4fcfc26e771a22fb55184e7c7e32b
parentd2d4e780aff2fab46a792ebc89f80d1a6872b325 (diff)
ide: add drive->dma_mode field
Add dma_mode field to ide_drive_t matching dma_mode field used in struct ata_device. The validity of the field is restricted to ->dma_pio_mode method only currently in IDE subsystem. Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--drivers/ide/aec62xx.c1
-rw-r--r--drivers/ide/ide-xfer-mode.c2
-rw-r--r--include/linux/ide.h1
3 files changed, 4 insertions, 0 deletions
diff --git a/drivers/ide/aec62xx.c b/drivers/ide/aec62xx.c
index 878f8ec6dbe..4c869872eb9 100644
--- a/drivers/ide/aec62xx.c
+++ b/drivers/ide/aec62xx.c
@@ -136,6 +136,7 @@ static void aec6260_set_mode(ide_drive_t *drive, const u8 speed)
static void aec_set_pio_mode(ide_drive_t *drive, const u8 pio)
{
+ drive->dma_mode = pio + XFER_PIO_0;
drive->hwif->port_ops->set_dma_mode(drive, pio + XFER_PIO_0);
}
diff --git a/drivers/ide/ide-xfer-mode.c b/drivers/ide/ide-xfer-mode.c
index cdae463f6b4..c2323869d92 100644
--- a/drivers/ide/ide-xfer-mode.c
+++ b/drivers/ide/ide-xfer-mode.c
@@ -167,9 +167,11 @@ int ide_set_dma_mode(ide_drive_t *drive, const u8 mode)
if (hwif->host_flags & IDE_HFLAG_POST_SET_MODE) {
if (ide_config_drive_speed(drive, mode))
return -1;
+ drive->dma_mode = mode;
port_ops->set_dma_mode(drive, mode);
return 0;
} else {
+ drive->dma_mode = mode;
port_ops->set_dma_mode(drive, mode);
return ide_config_drive_speed(drive, mode);
}
diff --git a/include/linux/ide.h b/include/linux/ide.h
index b5d2e965505..746ef9fdabc 100644
--- a/include/linux/ide.h
+++ b/include/linux/ide.h
@@ -516,6 +516,7 @@ struct ide_drive_s {
u8 current_speed; /* current transfer rate set */
u8 desired_speed; /* desired transfer rate set */
u8 pio_mode; /* for ->set_pio_mode _only_ */
+ u8 dma_mode; /* for ->dma_pio_mode _only_ */
u8 dn; /* now wide spread use */
u8 acoustic; /* acoustic management */
u8 media; /* disk, cdrom, tape, floppy, ... */