diff options
-rw-r--r-- | drivers/ide/pci/scc_pata.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/ide/pci/scc_pata.c b/drivers/ide/pci/scc_pata.c index 80c553faa8ad..0d1e4fc86ca6 100644 --- a/drivers/ide/pci/scc_pata.c +++ b/drivers/ide/pci/scc_pata.c | |||
@@ -65,7 +65,7 @@ | |||
65 | 65 | ||
66 | static struct scc_ports { | 66 | static struct scc_ports { |
67 | unsigned long ctl, dma; | 67 | unsigned long ctl, dma; |
68 | unsigned char hwif_id; /* for removing hwif from system */ | 68 | ide_hwif_t *hwif; /* for removing port from system */ |
69 | } scc_ports[MAX_HWIFS]; | 69 | } scc_ports[MAX_HWIFS]; |
70 | 70 | ||
71 | /* PIO transfer mode table */ | 71 | /* PIO transfer mode table */ |
@@ -692,7 +692,7 @@ static void __devinit init_hwif_scc(ide_hwif_t *hwif) | |||
692 | { | 692 | { |
693 | struct scc_ports *ports = ide_get_hwifdata(hwif); | 693 | struct scc_ports *ports = ide_get_hwifdata(hwif); |
694 | 694 | ||
695 | ports->hwif_id = hwif->index; | 695 | ports->hwif = hwif; |
696 | 696 | ||
697 | hwif->dma_command = hwif->dma_base; | 697 | hwif->dma_command = hwif->dma_base; |
698 | hwif->dma_status = hwif->dma_base + 0x04; | 698 | hwif->dma_status = hwif->dma_base + 0x04; |
@@ -754,7 +754,7 @@ static int __devinit scc_init_one(struct pci_dev *dev, const struct pci_device_i | |||
754 | static void __devexit scc_remove(struct pci_dev *dev) | 754 | static void __devexit scc_remove(struct pci_dev *dev) |
755 | { | 755 | { |
756 | struct scc_ports *ports = pci_get_drvdata(dev); | 756 | struct scc_ports *ports = pci_get_drvdata(dev); |
757 | ide_hwif_t *hwif = &ide_hwifs[ports->hwif_id]; | 757 | ide_hwif_t *hwif = ports->hwif; |
758 | unsigned long ctl_base = pci_resource_start(dev, 0); | 758 | unsigned long ctl_base = pci_resource_start(dev, 0); |
759 | unsigned long dma_base = pci_resource_start(dev, 1); | 759 | unsigned long dma_base = pci_resource_start(dev, 1); |
760 | unsigned long ctl_size = pci_resource_len(dev, 0); | 760 | unsigned long ctl_size = pci_resource_len(dev, 0); |