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

Commit fd9bb539 authored by Bartlomiej Zolnierkiewicz's avatar Bartlomiej Zolnierkiewicz
Browse files

ide: add ->fixup method to ide_hwif_t 



* Add ->fixup method to ide_hwif_t.

* Set hwif->fixup in ide_pci_setup_ports() to d->fixup.

* Use hwif->fixup in probe_hwif().

* Use probe_hwif_init() instead of probe_hwif_init_with_fixup() in
  ide_setup_pci_device().

* Add 'fixup' argument to ide_register_hw() and use it to set hwif->fixup,
  update all ide_register_hw() users accordingly.

* Convert ide-cs/delkin_cb host drivers to use ide_register_hw().

* Restore hwif->fixup in ide_hwif_restore().

* Remove ide_register_hw_with_fixup(), probe_hwif_init_with_fixup()
  and 'fixup' argument from probe_hwif().

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

drivers/ide/arm/bast-ide.c

+1 −1
Original line number Diff line number Diff line
@@ -45,7 +45,7 @@ bastide_register(unsigned int base, unsigned int aux, int irq, 
	hw.io_ports[IDE_CONTROL_OFFSET] = aux + (6 * 0x20);

	hw.irq = irq;



	ide_register_hw(&hw, 0, hwif);

	ide_register_hw(&hw, NULL, 0, hwif);



	return 0;

}

drivers/ide/arm/ide_arm.c

+1 −1
Original line number Diff line number Diff line
@@ -31,5 +31,5 @@ void __init ide_arm_init(void) 
	memset(&hw, 0, sizeof(hw));

	ide_std_init_ports(&hw, IDE_ARM_IO, IDE_ARM_IO + 0x206);

	hw.irq = IDE_ARM_IRQ;

	ide_register_hw(&hw, 1, NULL);

	ide_register_hw(&hw, NULL, 1, NULL);

}

drivers/ide/cris/ide-cris.c

+1 −1
Original line number Diff line number Diff line
@@ -782,7 +782,7 @@ init_e100_ide (void) 
		                ide_offsets,

		                0, 0, cris_ide_ack_intr,

		                ide_default_irq(0));

		ide_register_hw(&hw, 1, &hwif);

		ide_register_hw(&hw, NULL, 1, &hwif);

		hwif->mmio = 1;

		hwif->chipset = ide_etrax100;

		hwif->set_pio_mode = &cris_set_pio_mode;

drivers/ide/h8300/ide-h8300.c

+1 −1
Original line number Diff line number Diff line
@@ -101,7 +101,7 @@ void __init h8300_ide_init(void) 
	hw_setup(&hw);



	/* register if */

	idx = ide_register_hw(&hw, 1, &hwif);

	idx = ide_register_hw(&hw, NULL, 1, &hwif);

	if (idx == -1) {

		printk(KERN_ERR "ide-h8300: IDE I/F register failed\n");

		return;

drivers/ide/ide-pnp.c

+1 −1
Original line number Diff line number Diff line
@@ -42,7 +42,7 @@ static int idepnp_probe(struct pnp_dev * dev, const struct pnp_device_id *dev_id 
	hw.irq = pnp_irq(dev, 0);

	hw.dma = NO_DMA;



	index = ide_register_hw(&hw, 1, &hwif);

	index = ide_register_hw(&hw, NULL, 1, &hwif);



	if (index != -1) {

	    	printk(KERN_INFO "ide%d: generic PnP IDE interface\n", index);