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

Commit 7f612f27 authored by Bartlomiej Zolnierkiewicz's avatar Bartlomiej Zolnierkiewicz
Browse files

ide: remove [ata_]select_t 



* Use 'drive->dn & 1' in ide_init_disk().

* remove [ata_]select_t.

While at it:

* Use ATA_DEVICE_OBS define in ide_port_init_devices_data().

Acked-by: default avatarSergei Shtylyov <sshtylyov@ru.mvista.com>
Signed-off-by: default avatarBartlomiej Zolnierkiewicz <bzolnier@gmail.com>
parent 123995b9

drivers/ide/h8300/ide-h8300.c

+1 −1
Original line number Diff line number Diff line
@@ -80,7 +80,7 @@ static void h8300_tf_load(ide_drive_t *drive, ide_task_t *task) 
		outb(tf->lbah, io_ports->lbah_addr);



	if (task->tf_flags & IDE_TFLAG_OUT_DEVICE)

		outb((tf->device & HIHI) | drive->select.all,

		outb((tf->device & HIHI) | drive->select,

		     io_ports->device_addr);

}

drivers/ide/ide-io.c

+1 −1
Original line number Diff line number Diff line
@@ -495,7 +495,7 @@ static void ide_tf_set_specify_cmd(ide_drive_t *drive, struct ide_taskfile *tf) 
	tf->lbal    = drive->sect;

	tf->lbam    = drive->cyl;

	tf->lbah    = drive->cyl >> 8;

	tf->device  = (drive->head - 1) | drive->select.all;

	tf->device  = (drive->head - 1) | drive->select;

	tf->command = ATA_CMD_INIT_DEV_PARAMS;

}

drivers/ide/ide-iops.c

+1 −1
Original line number Diff line number Diff line
@@ -181,7 +181,7 @@ void ide_tf_load(ide_drive_t *drive, ide_task_t *task) 
		tf_outb(tf->lbah, io_ports->lbah_addr);



	if (task->tf_flags & IDE_TFLAG_OUT_DEVICE)

		tf_outb((tf->device & HIHI) | drive->select.all,

		tf_outb((tf->device & HIHI) | drive->select,

			 io_ports->device_addr);

}

EXPORT_SYMBOL_GPL(ide_tf_load);

drivers/ide/ide-probe.c

+2 −2
Original line number Diff line number Diff line
@@ -446,7 +446,7 @@ static int do_probe (ide_drive_t *drive, u8 cmd) 
	SELECT_DRIVE(drive);

	msleep(50);



	if (ide_read_device(drive) != drive->select.all && present == 0) {

	if (ide_read_device(drive) != drive->select && present == 0) {

		if (drive->dn & 1) {

			/* exit with drive0 selected */

			SELECT_DRIVE(&hwif->drives[0]);
@@ -1211,7 +1211,7 @@ EXPORT_SYMBOL_GPL(ide_unregister_region); 
void ide_init_disk(struct gendisk *disk, ide_drive_t *drive)

{

	ide_hwif_t *hwif = drive->hwif;

	unsigned int unit = (drive->select.all >> 4) & 1;

	unsigned int unit = drive->dn & 1;



	disk->major = hwif->major;

	disk->first_minor = unit << PARTN_BITS;

drivers/ide/ide.c

+1 −1
Original line number Diff line number Diff line
@@ -114,7 +114,7 @@ static void ide_port_init_devices_data(ide_hwif_t *hwif) 
		memset(drive, 0, sizeof(*drive));



		drive->media			= ide_disk;

		drive->select.all		= (unit<<4)|0xa0;

		drive->select			= (unit << 4) | ATA_DEVICE_OBS;

		drive->hwif			= hwif;

		drive->ready_stat		= ATA_DRDY;

		drive->bad_wstat		= BAD_W_STAT;