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>

diff --git a/drivers/ide/ide-devsets.c b/drivers/ide/ide-devsets.c
index 1099bf7cf968ac216818e7ed0b6973e6cd6741ce..cb3341ce655ceb75f3c2cfca9453c4e068788d32 100644 (file)
--- 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 4d76ba473097ac2ad89295181f9c8adb5433156a..9a9f10f4cf9fdaf56d23b79b585d9507ce5fc403 100644 (file)
--- 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 46d203ce60cc4ab879be08a85b2f2a8540ddd88e..cdae463f6b417b6b9ad2fbbd77ca037c6f78ec4b 100644 (file)
--- 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);
        }

diff --git a/include/linux/ide.h b/include/linux/ide.h
index 0ec612959042dbfece0dbac4dbc33c11c4da43f5..b5d2e96550593e948ced08bcb9a540ab23b6bf79 100644 (file)
--- a/include/linux/ide.h
+++ b/include/linux/ide.h
@@ -515,6 +515,7 @@ struct ide_drive_s {
         u8     init_speed;     /* transfer rate set at boot */
         u8     current_speed;  /* current transfer rate set */
        u8      desired_speed;  /* desired transfer rate set */
+       u8      pio_mode;       /* for ->set_pio_mode _only_ */
         u8     dn;             /* now wide spread use */
        u8      acoustic;       /* acoustic management */
        u8      media;          /* disk, cdrom, tape, floppy, ... */