Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d2d4e780 authored by Bartlomiej Zolnierkiewicz's avatar Bartlomiej Zolnierkiewicz Committed by David S. Miller
Browse files

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: default avatarBartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 68d0a036

drivers/ide/ide-devsets.c

+2 −0
Original line number Diff line number Diff line
@@ -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;

drivers/ide/ide-probe.c

+2 −0
Original line number Diff line number Diff line
@@ -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);

	}

drivers/ide/ide-xfer-mode.c

+3 −0
Original line number Diff line number Diff line
@@ -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);

	}

include/linux/ide.h

+1 −0
Original line number Diff line number Diff line
@@ -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, ... */