diff options
Diffstat (limited to 'drivers/ide/pci/hpt34x.c')
-rw-r--r-- | drivers/ide/pci/hpt34x.c | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/drivers/ide/pci/hpt34x.c b/drivers/ide/pci/hpt34x.c index 9f2fc3094000..e4193ef56797 100644 --- a/drivers/ide/pci/hpt34x.c +++ b/drivers/ide/pci/hpt34x.c | |||
@@ -115,11 +115,10 @@ static unsigned int __devinit init_chipset_hpt34x(struct pci_dev *dev, const cha | |||
115 | return dev->irq; | 115 | return dev->irq; |
116 | } | 116 | } |
117 | 117 | ||
118 | static void __devinit init_hwif_hpt34x(ide_hwif_t *hwif) | 118 | static const struct ide_port_ops hpt34x_port_ops = { |
119 | { | 119 | .set_pio_mode = hpt34x_set_pio_mode, |
120 | hwif->set_pio_mode = &hpt34x_set_pio_mode; | 120 | .set_dma_mode = hpt34x_set_mode, |
121 | hwif->set_dma_mode = &hpt34x_set_mode; | 121 | }; |
122 | } | ||
123 | 122 | ||
124 | #define IDE_HFLAGS_HPT34X \ | 123 | #define IDE_HFLAGS_HPT34X \ |
125 | (IDE_HFLAG_NO_ATAPI_DMA | \ | 124 | (IDE_HFLAG_NO_ATAPI_DMA | \ |
@@ -131,16 +130,16 @@ static const struct ide_port_info hpt34x_chipsets[] __devinitdata = { | |||
131 | { /* 0 */ | 130 | { /* 0 */ |
132 | .name = "HPT343", | 131 | .name = "HPT343", |
133 | .init_chipset = init_chipset_hpt34x, | 132 | .init_chipset = init_chipset_hpt34x, |
134 | .init_hwif = init_hwif_hpt34x, | ||
135 | .extra = 16, | 133 | .extra = 16, |
134 | .port_ops = &hpt34x_port_ops, | ||
136 | .host_flags = IDE_HFLAGS_HPT34X | IDE_HFLAG_NON_BOOTABLE, | 135 | .host_flags = IDE_HFLAGS_HPT34X | IDE_HFLAG_NON_BOOTABLE, |
137 | .pio_mask = ATA_PIO5, | 136 | .pio_mask = ATA_PIO5, |
138 | }, | 137 | }, |
139 | { /* 1 */ | 138 | { /* 1 */ |
140 | .name = "HPT345", | 139 | .name = "HPT345", |
141 | .init_chipset = init_chipset_hpt34x, | 140 | .init_chipset = init_chipset_hpt34x, |
142 | .init_hwif = init_hwif_hpt34x, | ||
143 | .extra = 16, | 141 | .extra = 16, |
142 | .port_ops = &hpt34x_port_ops, | ||
144 | .host_flags = IDE_HFLAGS_HPT34X | IDE_HFLAG_OFF_BOARD, | 143 | .host_flags = IDE_HFLAGS_HPT34X | IDE_HFLAG_OFF_BOARD, |
145 | .pio_mask = ATA_PIO5, | 144 | .pio_mask = ATA_PIO5, |
146 | #ifdef CONFIG_HPT34X_AUTODMA | 145 | #ifdef CONFIG_HPT34X_AUTODMA |