diff options
author | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2010-01-18 02:20:35 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2010-01-19 04:42:01 -0500 |
commit | 3fccaa192b9501e79a57e02e62b6bf420d2b461e (patch) | |
tree | fec8af09d6e4fcfc26e771a22fb55184e7c7e32b /drivers/ide | |
parent | d2d4e780aff2fab46a792ebc89f80d1a6872b325 (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>
Diffstat (limited to 'drivers/ide')
-rw-r--r-- | drivers/ide/aec62xx.c | 1 | ||||
-rw-r--r-- | drivers/ide/ide-xfer-mode.c | 2 |
2 files changed, 3 insertions, 0 deletions
diff --git a/drivers/ide/aec62xx.c b/drivers/ide/aec62xx.c index 878f8ec6dbe1..4c869872eb9a 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) | |||
136 | 136 | ||
137 | static void aec_set_pio_mode(ide_drive_t *drive, const u8 pio) | 137 | static void aec_set_pio_mode(ide_drive_t *drive, const u8 pio) |
138 | { | 138 | { |
139 | drive->dma_mode = pio + XFER_PIO_0; | ||
139 | drive->hwif->port_ops->set_dma_mode(drive, pio + XFER_PIO_0); | 140 | drive->hwif->port_ops->set_dma_mode(drive, pio + XFER_PIO_0); |
140 | } | 141 | } |
141 | 142 | ||
diff --git a/drivers/ide/ide-xfer-mode.c b/drivers/ide/ide-xfer-mode.c index cdae463f6b41..c2323869d92a 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) | |||
167 | if (hwif->host_flags & IDE_HFLAG_POST_SET_MODE) { | 167 | if (hwif->host_flags & IDE_HFLAG_POST_SET_MODE) { |
168 | if (ide_config_drive_speed(drive, mode)) | 168 | if (ide_config_drive_speed(drive, mode)) |
169 | return -1; | 169 | return -1; |
170 | drive->dma_mode = mode; | ||
170 | port_ops->set_dma_mode(drive, mode); | 171 | port_ops->set_dma_mode(drive, mode); |
171 | return 0; | 172 | return 0; |
172 | } else { | 173 | } else { |
174 | drive->dma_mode = mode; | ||
173 | port_ops->set_dma_mode(drive, mode); | 175 | port_ops->set_dma_mode(drive, mode); |
174 | return ide_config_drive_speed(drive, mode); | 176 | return ide_config_drive_speed(drive, mode); |
175 | } | 177 | } |