diff options
Diffstat (limited to 'drivers/ata/ata_generic.c')
-rw-r--r-- | drivers/ata/ata_generic.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/ata/ata_generic.c b/drivers/ata/ata_generic.c index 24af56081b5d..be66ea08da55 100644 --- a/drivers/ata/ata_generic.c +++ b/drivers/ata/ata_generic.c | |||
@@ -79,7 +79,7 @@ static int generic_set_mode(struct ata_port *ap, struct ata_device **unused) | |||
79 | 79 | ||
80 | /* Bits 5 and 6 indicate if DMA is active on master/slave */ | 80 | /* Bits 5 and 6 indicate if DMA is active on master/slave */ |
81 | if (ap->ioaddr.bmdma_addr) | 81 | if (ap->ioaddr.bmdma_addr) |
82 | dma_enabled = inb(ap->ioaddr.bmdma_addr + ATA_DMA_CMD); | 82 | dma_enabled = ioread8(ap->ioaddr.bmdma_addr + ATA_DMA_CMD); |
83 | 83 | ||
84 | for (i = 0; i < ATA_MAX_DEVICES; i++) { | 84 | for (i = 0; i < ATA_MAX_DEVICES; i++) { |
85 | struct ata_device *dev = &ap->device[i]; | 85 | struct ata_device *dev = &ap->device[i]; |
@@ -138,7 +138,7 @@ static struct ata_port_operations generic_port_ops = { | |||
138 | .bmdma_stop = ata_bmdma_stop, | 138 | .bmdma_stop = ata_bmdma_stop, |
139 | .bmdma_status = ata_bmdma_status, | 139 | .bmdma_status = ata_bmdma_status, |
140 | 140 | ||
141 | .data_xfer = ata_pio_data_xfer, | 141 | .data_xfer = ata_data_xfer, |
142 | 142 | ||
143 | .freeze = ata_bmdma_freeze, | 143 | .freeze = ata_bmdma_freeze, |
144 | .thaw = ata_bmdma_thaw, | 144 | .thaw = ata_bmdma_thaw, |
@@ -150,10 +150,10 @@ static struct ata_port_operations generic_port_ops = { | |||
150 | 150 | ||
151 | .irq_handler = ata_interrupt, | 151 | .irq_handler = ata_interrupt, |
152 | .irq_clear = ata_bmdma_irq_clear, | 152 | .irq_clear = ata_bmdma_irq_clear, |
153 | .irq_on = ata_irq_on, | ||
154 | .irq_ack = ata_irq_ack, | ||
153 | 155 | ||
154 | .port_start = ata_port_start, | 156 | .port_start = ata_port_start, |
155 | .port_stop = ata_port_stop, | ||
156 | .host_stop = ata_host_stop | ||
157 | }; | 157 | }; |
158 | 158 | ||
159 | static int all_generic_ide; /* Set to claim all devices */ | 159 | static int all_generic_ide; /* Set to claim all devices */ |