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

Commit 123995b9 authored by Bartlomiej Zolnierkiewicz's avatar Bartlomiej Zolnierkiewicz
Browse files

ide: use 'drive->dn & 1' instead of drive->select.b.unit 



* Call ide_port_init_devices() in ide_host_register()
  also if 'struct ide_port_info *d' is not available.

* Init drive->dn in ide_port_init_devices() instead of
  ide_probe_port() so it is valid also in ->init_dev.

* Pass device number to ide_dev_apply_params().

* Use 'drive->dn & 1' instead of drive->select.b.unit.

There should be no functional changes caused by this patch.

Signed-off-by: default avatarBartlomiej Zolnierkiewicz <bzolnier@gmail.com>
parent 8595259c

drivers/ide/ide-dma.c

+1 −1
Original line number Diff line number Diff line
@@ -370,7 +370,7 @@ static int dma_timer_expiry (ide_drive_t *drive) 
void ide_dma_host_set(ide_drive_t *drive, int on)

{

	ide_hwif_t *hwif	= HWIF(drive);

	u8 unit			= (drive->select.b.unit & 0x01);

	u8 unit			= drive->dn & 1;

	u8 dma_stat		= hwif->tp_ops->read_sff_dma_status(hwif);



	if (on)

drivers/ide/ide-probe.c

+14 −12
Original line number Diff line number Diff line
@@ -447,7 +447,7 @@ static int do_probe (ide_drive_t *drive, u8 cmd) 
	msleep(50);



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

		if (drive->select.b.unit != 0) {

		if (drive->dn & 1) {

			/* exit with drive0 selected */

			SELECT_DRIVE(&hwif->drives[0]);

			/* allow ATA_BUSY to assert & clear */
@@ -493,7 +493,7 @@ static int do_probe (ide_drive_t *drive, u8 cmd) 
		/* not present or maybe ATAPI */

		rc = 3;

	}

	if (drive->select.b.unit != 0) {

	if (drive->dn & 1) {

		/* exit with drive0 selected */

		SELECT_DRIVE(&hwif->drives[0]);

		msleep(50);
@@ -798,7 +798,7 @@ static int ide_probe_port(ide_hwif_t *hwif) 
	 */

	for (unit = 0; unit < MAX_DRIVES; ++unit) {

		ide_drive_t *drive = &hwif->drives[unit];

		drive->dn = (hwif->channel ? 2 : 0) + unit;



		(void) probe_for_drive(drive);

		if (drive->dev_flags & IDE_DFLAG_PRESENT)

			rc = 0;
@@ -1357,6 +1357,8 @@ static void ide_port_init_devices(ide_hwif_t *hwif) 
	for (i = 0; i < MAX_DRIVES; i++) {

		ide_drive_t *drive = &hwif->drives[i];



		drive->dn = i + hwif->channel * 2;



		if (hwif->host_flags & IDE_HFLAG_IO_32BIT)

			drive->io_32bit = 1;

		if (hwif->host_flags & IDE_HFLAG_UNMASK_IRQS)
@@ -1627,9 +1629,7 @@ int ide_host_register(struct ide_host *host, const struct ide_port_info *d, 


		if (d == NULL) {

			mate = NULL;

			continue;

		}



		} else {

			if ((i & 1) && mate) {

				hwif->mate = mate;

				mate->mate = hwif;
@@ -1639,6 +1639,8 @@ int ide_host_register(struct ide_host *host, const struct ide_port_info *d, 


			ide_init_port(hwif, i & 1, d);

			ide_port_cable_detect(hwif);

		}



		ide_port_init_devices(hwif);

	}

drivers/ide/ide.c

+3 −3
Original line number Diff line number Diff line
@@ -713,9 +713,9 @@ static int ide_set_disk_chs(const char *str, struct kernel_param *kp) 
module_param_call(chs, ide_set_disk_chs, NULL, NULL, 0);

MODULE_PARM_DESC(chs, "force device as a disk (using CHS)");



static void ide_dev_apply_params(ide_drive_t *drive)

static void ide_dev_apply_params(ide_drive_t *drive, u8 unit)

{

	int i = drive->hwif->index * MAX_DRIVES + drive->select.b.unit;

	int i = drive->hwif->index * MAX_DRIVES + unit;



	if (ide_nodma & (1 << i)) {

		printk(KERN_INFO "ide: disallowing DMA for %s\n", drive->name);
@@ -791,7 +791,7 @@ void ide_port_apply_params(ide_hwif_t *hwif) 
	}



	for (i = 0; i < MAX_DRIVES; i++)

		ide_dev_apply_params(&hwif->drives[i]);

		ide_dev_apply_params(&hwif->drives[i], i);

}



/*

drivers/ide/legacy/ali14xx.c

+1 −1
Original line number Diff line number Diff line
@@ -131,7 +131,7 @@ static void ali14xx_set_pio_mode(ide_drive_t *drive, const u8 pio) 
		drive->name, pio, time1, time2, param1, param2, param3, param4);



	/* stuff timing parameters into controller registers */

	driveNum = (HWIF(drive)->index << 1) + drive->select.b.unit;

	driveNum = (drive->hwif->index << 1) + (drive->dn & 1);

	spin_lock_irqsave(&ali14xx_lock, flags);

	outb_p(regOn, basePort);

	outReg(param1, regTab[driveNum].reg1);

drivers/ide/legacy/qd65xx.c

+1 −1
Original line number Diff line number Diff line
@@ -305,7 +305,7 @@ static void __init qd6580_init_dev(ide_drive_t *drive) 
	} else

		t2 = t1 = hwif->channel ? QD6580_DEF_DATA2 : QD6580_DEF_DATA;



	drive->drive_data = drive->select.b.unit ? t2 : t1;

	drive->drive_data = (drive->dn & 1) ? t2 : t1;

}



static const struct ide_port_ops qd6500_port_ops = {