diff options
Diffstat (limited to 'drivers/ide/ide.c')
-rw-r--r-- | drivers/ide/ide.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/drivers/ide/ide.c b/drivers/ide/ide.c index 7819fbd4d5fd..0d7328e0fb96 100644 --- a/drivers/ide/ide.c +++ b/drivers/ide/ide.c | |||
@@ -414,8 +414,6 @@ static void ide_hwif_restore(ide_hwif_t *hwif, ide_hwif_t *tmp_hwif) | |||
414 | hwif->cds = tmp_hwif->cds; | 414 | hwif->cds = tmp_hwif->cds; |
415 | #endif | 415 | #endif |
416 | 416 | ||
417 | hwif->fixup = tmp_hwif->fixup; | ||
418 | |||
419 | hwif->set_pio_mode = tmp_hwif->set_pio_mode; | 417 | hwif->set_pio_mode = tmp_hwif->set_pio_mode; |
420 | hwif->set_dma_mode = tmp_hwif->set_dma_mode; | 418 | hwif->set_dma_mode = tmp_hwif->set_dma_mode; |
421 | hwif->mdma_filter = tmp_hwif->mdma_filter; | 419 | hwif->mdma_filter = tmp_hwif->mdma_filter; |
@@ -680,7 +678,7 @@ void ide_setup_ports ( hw_regs_t *hw, | |||
680 | /** | 678 | /** |
681 | * ide_register_hw - register IDE interface | 679 | * ide_register_hw - register IDE interface |
682 | * @hw: hardware registers | 680 | * @hw: hardware registers |
683 | * @fixup: fixup function | 681 | * @quirkproc: quirkproc function |
684 | * @initializing: set while initializing built-in drivers | 682 | * @initializing: set while initializing built-in drivers |
685 | * @hwifp: pointer to returned hwif | 683 | * @hwifp: pointer to returned hwif |
686 | * | 684 | * |
@@ -690,7 +688,7 @@ void ide_setup_ports ( hw_regs_t *hw, | |||
690 | * Returns -1 on error. | 688 | * Returns -1 on error. |
691 | */ | 689 | */ |
692 | 690 | ||
693 | int ide_register_hw(hw_regs_t *hw, void (*fixup)(ide_hwif_t *), | 691 | int ide_register_hw(hw_regs_t *hw, void (*quirkproc)(ide_drive_t *), |
694 | int initializing, ide_hwif_t **hwifp) | 692 | int initializing, ide_hwif_t **hwifp) |
695 | { | 693 | { |
696 | int index, retry = 1; | 694 | int index, retry = 1; |
@@ -726,7 +724,7 @@ found: | |||
726 | memcpy(hwif->io_ports, hw->io_ports, sizeof(hwif->io_ports)); | 724 | memcpy(hwif->io_ports, hw->io_ports, sizeof(hwif->io_ports)); |
727 | hwif->irq = hw->irq; | 725 | hwif->irq = hw->irq; |
728 | hwif->noprobe = 0; | 726 | hwif->noprobe = 0; |
729 | hwif->fixup = fixup; | 727 | hwif->quirkproc = quirkproc; |
730 | hwif->chipset = hw->chipset; | 728 | hwif->chipset = hw->chipset; |
731 | hwif->gendev.parent = hw->dev; | 729 | hwif->gendev.parent = hw->dev; |
732 | hwif->ack_intr = hw->ack_intr; | 730 | hwif->ack_intr = hw->ack_intr; |