ide: pass hw_regs_t-s to ide_device_add[_all]() (take 3)

[pandora-kernel.git] / drivers / ide / pci / delkin_cb.c

diff --git a/drivers/ide/pci/delkin_cb.c b/drivers/ide/pci/delkin_cb.c
index 0106e2a..33fe15d 100644 (file)
--- a/drivers/ide/pci/delkin_cb.c
+++ b/drivers/ide/pci/delkin_cb.c
@@ -57,9 +57,9 @@ static int __devinit
 delkin_cb_probe (struct pci_dev *dev, const struct pci_device_id *id)
 {
        unsigned long base;
-       hw_regs_t hw;
        ide_hwif_t *hwif = NULL;
        int i, rc;
+       hw_regs_t hw, *hws[] = { &hw, NULL, NULL, NULL };
        u8 idx[4] = { 0xff, 0xff, 0xff, 0xff };
 
        rc = pci_enable_device(dev);
@@ -93,11 +93,9 @@ delkin_cb_probe (struct pci_dev *dev, const struct pci_device_id *id)
 
        i = hwif->index;
 
-       ide_init_port_hw(hwif, &hw);
-
        idx[0] = i;
 
-       ide_device_add(idx, &delkin_cb_port_info);
+       ide_device_add(idx, &delkin_cb_port_info, hws);
 
        pci_set_drvdata(dev, hwif);