diff options
Diffstat (limited to 'drivers/ata/sata_svw.c')
-rw-r--r-- | drivers/ata/sata_svw.c | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/drivers/ata/sata_svw.c b/drivers/ata/sata_svw.c index d9678e7bc3a9..12d613c48c19 100644 --- a/drivers/ata/sata_svw.c +++ b/drivers/ata/sata_svw.c | |||
@@ -329,7 +329,6 @@ static struct scsi_host_template k2_sata_sht = { | |||
329 | 329 | ||
330 | 330 | ||
331 | static const struct ata_port_operations k2_sata_ops = { | 331 | static const struct ata_port_operations k2_sata_ops = { |
332 | .port_disable = ata_port_disable, | ||
333 | .tf_load = k2_sata_tf_load, | 332 | .tf_load = k2_sata_tf_load, |
334 | .tf_read = k2_sata_tf_read, | 333 | .tf_read = k2_sata_tf_read, |
335 | .check_status = k2_stat_check_status, | 334 | .check_status = k2_stat_check_status, |
@@ -349,7 +348,6 @@ static const struct ata_port_operations k2_sata_ops = { | |||
349 | .post_internal_cmd = ata_bmdma_post_internal_cmd, | 348 | .post_internal_cmd = ata_bmdma_post_internal_cmd, |
350 | .irq_clear = ata_bmdma_irq_clear, | 349 | .irq_clear = ata_bmdma_irq_clear, |
351 | .irq_on = ata_irq_on, | 350 | .irq_on = ata_irq_on, |
352 | .irq_ack = ata_irq_ack, | ||
353 | .scr_read = k2_sata_scr_read, | 351 | .scr_read = k2_sata_scr_read, |
354 | .scr_write = k2_sata_scr_write, | 352 | .scr_write = k2_sata_scr_write, |
355 | .port_start = ata_port_start, | 353 | .port_start = ata_port_start, |
@@ -445,9 +443,15 @@ static int k2_sata_init_one (struct pci_dev *pdev, const struct pci_device_id *e | |||
445 | /* different controllers have different number of ports - currently 4 or 8 */ | 443 | /* different controllers have different number of ports - currently 4 or 8 */ |
446 | /* All ports are on the same function. Multi-function device is no | 444 | /* All ports are on the same function. Multi-function device is no |
447 | * longer available. This should not be seen in any system. */ | 445 | * longer available. This should not be seen in any system. */ |
448 | for (i = 0; i < host->n_ports; i++) | 446 | for (i = 0; i < host->n_ports; i++) { |
449 | k2_sata_setup_port(&host->ports[i]->ioaddr, | 447 | struct ata_port *ap = host->ports[i]; |
450 | mmio_base + i * K2_SATA_PORT_OFFSET); | 448 | unsigned int offset = i * K2_SATA_PORT_OFFSET; |
449 | |||
450 | k2_sata_setup_port(&ap->ioaddr, mmio_base + offset); | ||
451 | |||
452 | ata_port_pbar_desc(ap, 5, -1, "mmio"); | ||
453 | ata_port_pbar_desc(ap, 5, offset, "port"); | ||
454 | } | ||
451 | 455 | ||
452 | rc = pci_set_dma_mask(pdev, ATA_DMA_MASK); | 456 | rc = pci_set_dma_mask(pdev, ATA_DMA_MASK); |
453 | if (rc) | 457 | if (rc) |