aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/ide/ide-xfer-mode.c
diff options
context:
space:
mode:
authorBartlomiej Zolnierkiewicz <bzolnier@gmail.com>2010-01-18 02:20:28 -0500
committerDavid S. Miller <davem@davemloft.net>2010-01-19 04:42:00 -0500
commitd2d4e780aff2fab46a792ebc89f80d1a6872b325 (patch)
treee4ec30ac3d5e5c43a4a11769440a8d18d5be98de /drivers/ide/ide-xfer-mode.c
parent68d0a036162f12d8be07c9fc140507cc1c8c6120 (diff)
ide: add drive->pio_mode field
Add pio_mode field to ide_drive_t matching pio_mode field used in struct ata_device. The validity of the field is restricted to ->set_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/ide-xfer-mode.c')
-rw-r--r--drivers/ide/ide-xfer-mode.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/ide/ide-xfer-mode.c b/drivers/ide/ide-xfer-mode.c
index 46d203ce60cc..cdae463f6b41 100644
--- a/drivers/ide/ide-xfer-mode.c
+++ b/drivers/ide/ide-xfer-mode.c
@@ -135,6 +135,7 @@ int ide_set_pio_mode(ide_drive_t *drive, const u8 mode)
135 * set transfer mode on the device in ->set_pio_mode method... 135 * set transfer mode on the device in ->set_pio_mode method...
136 */ 136 */
137 if (port_ops->set_dma_mode == NULL) { 137 if (port_ops->set_dma_mode == NULL) {
138 drive->pio_mode = mode;
138 port_ops->set_pio_mode(drive, mode - XFER_PIO_0); 139 port_ops->set_pio_mode(drive, mode - XFER_PIO_0);
139 return 0; 140 return 0;
140 } 141 }
@@ -142,9 +143,11 @@ int ide_set_pio_mode(ide_drive_t *drive, const u8 mode)
142 if (hwif->host_flags & IDE_HFLAG_POST_SET_MODE) { 143 if (hwif->host_flags & IDE_HFLAG_POST_SET_MODE) {
143 if (ide_config_drive_speed(drive, mode)) 144 if (ide_config_drive_speed(drive, mode))
144 return -1; 145 return -1;
146 drive->pio_mode = mode;
145 port_ops->set_pio_mode(drive, mode - XFER_PIO_0); 147 port_ops->set_pio_mode(drive, mode - XFER_PIO_0);
146 return 0; 148 return 0;
147 } else { 149 } else {
150 drive->pio_mode = mode;
148 port_ops->set_pio_mode(drive, mode - XFER_PIO_0); 151 port_ops->set_pio_mode(drive, mode - XFER_PIO_0);
149 return ide_config_drive_speed(drive, mode); 152 return ide_config_drive_speed(drive, mode);
150 } 153 }