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: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>

1 files changed, 4 insertions, 2 deletions

diff --git a/drivers/ide/setup-pci.c b/drivers/ide/setup-pci.c
index d62b225f569f..4e9de2043113 100644
--- a/drivers/ide/setup-pci.c
+++ b/drivers/ide/setup-pci.c
@@ -567,6 +567,8 @@ void ide_pci_setup_ports(struct pci_dev *dev, ide_pci_device_t *d, int pciirq, a
                     (d->host_flags & IDE_HFLAG_FORCE_LEGACY_IRQS))
                         hwif->irq = port ? 15 : 14;
 
+                hwif->fixup = d->fixup;
+
                 hwif->host_flags = d->host_flags;
                 hwif->pio_mask = d->pio_mask;
 
@@ -692,9 +694,9 @@ int ide_setup_pci_device(struct pci_dev *dev, ide_pci_device_t *d)
                 mate = &ide_hwifs[index_list.b.high];
 
         if (hwif)
-                probe_hwif_init_with_fixup(hwif, d->fixup);
+                probe_hwif_init(hwif);
         if (mate)
-                probe_hwif_init_with_fixup(mate, d->fixup);
+                probe_hwif_init(mate);
 
         if (hwif)
                 ide_proc_register_port(hwif);