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>

3 files changed, 7 insertions, 0 deletions

diff --git a/drivers/ide/ide-devsets.c b/drivers/ide/ide-devsets.c
index 1099bf7cf968..cb3341ce655c 100644
--- a/drivers/ide/ide-devsets.c
+++ b/drivers/ide/ide-devsets.c
@@ -105,6 +105,8 @@ static int set_pio_mode(ide_drive_t *drive, int arg)
                 return -ENOSYS;
 
         if (set_pio_mode_abuse(drive->hwif, arg)) {
+                drive->pio_mode = arg + XFER_PIO_0;
+
                 if (arg == 8 || arg == 9) {
                         unsigned long flags;
 
diff --git a/drivers/ide/ide-probe.c b/drivers/ide/ide-probe.c
index 4d76ba473097..9a9f10f4cf9f 100644
--- a/drivers/ide/ide-probe.c
+++ b/drivers/ide/ide-probe.c
@@ -1043,6 +1043,8 @@ static void ide_port_init_devices(ide_hwif_t *hwif)
                 if (hwif->host_flags & IDE_HFLAG_NO_UNMASK_IRQS)
                         drive->dev_flags |= IDE_DFLAG_NO_UNMASK;
 
+                drive->pio_mode = XFER_PIO_0;
+
                 if (port_ops && port_ops->init_dev)
                         port_ops->init_dev(drive);
         }
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)
          * set transfer mode on the device in ->set_pio_mode method...
          */
         if (port_ops->set_dma_mode == NULL) {
+                drive->pio_mode = mode;
                 port_ops->set_pio_mode(drive, mode - XFER_PIO_0);
                 return 0;
         }
@@ -142,9 +143,11 @@ int ide_set_pio_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->pio_mode = mode;
                 port_ops->set_pio_mode(drive, mode - XFER_PIO_0);
                 return 0;
         } else {
+                drive->pio_mode = mode;
                 port_ops->set_pio_mode(drive, mode - XFER_PIO_0);
                 return ide_config_drive_speed(drive, mode);
         }