diff options
Diffstat (limited to 'drivers/ide/pci/sgiioc4.c')
-rw-r--r-- | drivers/ide/pci/sgiioc4.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/ide/pci/sgiioc4.c b/drivers/ide/pci/sgiioc4.c index c79ff5b41088..76afa1f9c599 100644 --- a/drivers/ide/pci/sgiioc4.c +++ b/drivers/ide/pci/sgiioc4.c | |||
@@ -584,8 +584,8 @@ sgiioc4_ide_setup_pci_device(struct pci_dev *dev) | |||
584 | unsigned long bar0, cmd_phys_base, ctl; | 584 | unsigned long bar0, cmd_phys_base, ctl; |
585 | void __iomem *virt_base; | 585 | void __iomem *virt_base; |
586 | ide_hwif_t *hwif; | 586 | ide_hwif_t *hwif; |
587 | hw_regs_t hw, *hws[] = { &hw, NULL, NULL, NULL }; | ||
587 | u8 idx[4] = { 0xff, 0xff, 0xff, 0xff }; | 588 | u8 idx[4] = { 0xff, 0xff, 0xff, 0xff }; |
588 | hw_regs_t hw; | ||
589 | struct ide_port_info d = sgiioc4_port_info; | 589 | struct ide_port_info d = sgiioc4_port_info; |
590 | 590 | ||
591 | /* Get the CmdBlk and CtrlBlk Base Registers */ | 591 | /* Get the CmdBlk and CtrlBlk Base Registers */ |
@@ -622,8 +622,6 @@ sgiioc4_ide_setup_pci_device(struct pci_dev *dev) | |||
622 | if (hwif == NULL) | 622 | if (hwif == NULL) |
623 | goto err; | 623 | goto err; |
624 | 624 | ||
625 | ide_init_port_hw(hwif, &hw); | ||
626 | |||
627 | /* The IOC4 uses MMIO rather than Port IO. */ | 625 | /* The IOC4 uses MMIO rather than Port IO. */ |
628 | default_hwif_mmiops(hwif); | 626 | default_hwif_mmiops(hwif); |
629 | 627 | ||
@@ -634,7 +632,7 @@ sgiioc4_ide_setup_pci_device(struct pci_dev *dev) | |||
634 | 632 | ||
635 | idx[0] = hwif->index; | 633 | idx[0] = hwif->index; |
636 | 634 | ||
637 | if (ide_device_add(idx, &d)) | 635 | if (ide_device_add(idx, &d, hws)) |
638 | return -EIO; | 636 | return -EIO; |
639 | 637 | ||
640 | return 0; | 638 | return 0; |