aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/ata/pata_hpt3x3.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/ata/pata_hpt3x3.c')
-rw-r--r--drivers/ata/pata_hpt3x3.c10
1 files changed, 6 insertions, 4 deletions
diff --git a/drivers/ata/pata_hpt3x3.c b/drivers/ata/pata_hpt3x3.c
index be0f05efac6d..cb8bdb6887de 100644
--- a/drivers/ata/pata_hpt3x3.c
+++ b/drivers/ata/pata_hpt3x3.c
@@ -120,7 +120,6 @@ static struct scsi_host_template hpt3x3_sht = {
120}; 120};
121 121
122static struct ata_port_operations hpt3x3_port_ops = { 122static struct ata_port_operations hpt3x3_port_ops = {
123 .port_disable = ata_port_disable,
124 .set_piomode = hpt3x3_set_piomode, 123 .set_piomode = hpt3x3_set_piomode,
125#if defined(CONFIG_PATA_HPT3X3_DMA) 124#if defined(CONFIG_PATA_HPT3X3_DMA)
126 .set_dmamode = hpt3x3_set_dmamode, 125 .set_dmamode = hpt3x3_set_dmamode,
@@ -153,9 +152,8 @@ static struct ata_port_operations hpt3x3_port_ops = {
153 .irq_handler = ata_interrupt, 152 .irq_handler = ata_interrupt,
154 .irq_clear = ata_bmdma_irq_clear, 153 .irq_clear = ata_bmdma_irq_clear,
155 .irq_on = ata_irq_on, 154 .irq_on = ata_irq_on,
156 .irq_ack = ata_irq_ack,
157 155
158 .port_start = ata_port_start, 156 .port_start = ata_sff_port_start,
159}; 157};
160 158
161/** 159/**
@@ -239,7 +237,8 @@ static int hpt3x3_init_one(struct pci_dev *pdev, const struct pci_device_id *id)
239 base = host->iomap[4]; /* Bus mastering base */ 237 base = host->iomap[4]; /* Bus mastering base */
240 238
241 for (i = 0; i < host->n_ports; i++) { 239 for (i = 0; i < host->n_ports; i++) {
242 struct ata_ioports *ioaddr = &host->ports[i]->ioaddr; 240 struct ata_port *ap = host->ports[i];
241 struct ata_ioports *ioaddr = &ap->ioaddr;
243 242
244 ioaddr->cmd_addr = base + offset_cmd[i]; 243 ioaddr->cmd_addr = base + offset_cmd[i];
245 ioaddr->altstatus_addr = 244 ioaddr->altstatus_addr =
@@ -247,6 +246,9 @@ static int hpt3x3_init_one(struct pci_dev *pdev, const struct pci_device_id *id)
247 ioaddr->scr_addr = NULL; 246 ioaddr->scr_addr = NULL;
248 ata_std_ports(ioaddr); 247 ata_std_ports(ioaddr);
249 ioaddr->bmdma_addr = base + 8 * i; 248 ioaddr->bmdma_addr = base + 8 * i;
249
250 ata_port_pbar_desc(ap, 4, -1, "ioport");
251 ata_port_pbar_desc(ap, 4, offset_cmd[i], "cmd");
250 } 252 }
251 pci_set_master(pdev); 253 pci_set_master(pdev);
252 return ata_host_activate(host, pdev->irq, ata_interrupt, IRQF_SHARED, 254 return ata_host_activate(host, pdev->irq, ata_interrupt, IRQF_SHARED,