diff options
Diffstat (limited to 'drivers/ata/sata_uli.c')
-rw-r--r-- | drivers/ata/sata_uli.c | 16 |
1 files changed, 13 insertions, 3 deletions
diff --git a/drivers/ata/sata_uli.c b/drivers/ata/sata_uli.c index e6b8b45279af..d394da085ae4 100644 --- a/drivers/ata/sata_uli.c +++ b/drivers/ata/sata_uli.c | |||
@@ -94,8 +94,6 @@ static struct scsi_host_template uli_sht = { | |||
94 | }; | 94 | }; |
95 | 95 | ||
96 | static const struct ata_port_operations uli_ops = { | 96 | static const struct ata_port_operations uli_ops = { |
97 | .port_disable = ata_port_disable, | ||
98 | |||
99 | .tf_load = ata_tf_load, | 97 | .tf_load = ata_tf_load, |
100 | .tf_read = ata_tf_read, | 98 | .tf_read = ata_tf_read, |
101 | .check_status = ata_check_status, | 99 | .check_status = ata_check_status, |
@@ -117,7 +115,6 @@ static const struct ata_port_operations uli_ops = { | |||
117 | 115 | ||
118 | .irq_clear = ata_bmdma_irq_clear, | 116 | .irq_clear = ata_bmdma_irq_clear, |
119 | .irq_on = ata_irq_on, | 117 | .irq_on = ata_irq_on, |
120 | .irq_ack = ata_irq_ack, | ||
121 | 118 | ||
122 | .scr_read = uli_scr_read, | 119 | .scr_read = uli_scr_read, |
123 | .scr_write = uli_scr_write, | 120 | .scr_write = uli_scr_write, |
@@ -242,6 +239,12 @@ static int uli_init_one (struct pci_dev *pdev, const struct pci_device_id *ent) | |||
242 | hpriv->scr_cfg_addr[2] = ULI5287_BASE + ULI5287_OFFS*4; | 239 | hpriv->scr_cfg_addr[2] = ULI5287_BASE + ULI5287_OFFS*4; |
243 | ata_std_ports(ioaddr); | 240 | ata_std_ports(ioaddr); |
244 | 241 | ||
242 | ata_port_desc(host->ports[2], | ||
243 | "cmd 0x%llx ctl 0x%llx bmdma 0x%llx", | ||
244 | (unsigned long long)pci_resource_start(pdev, 0) + 8, | ||
245 | ((unsigned long long)pci_resource_start(pdev, 1) | ATA_PCI_CTL_OFS) + 4, | ||
246 | (unsigned long long)pci_resource_start(pdev, 4) + 16); | ||
247 | |||
245 | ioaddr = &host->ports[3]->ioaddr; | 248 | ioaddr = &host->ports[3]->ioaddr; |
246 | ioaddr->cmd_addr = iomap[2] + 8; | 249 | ioaddr->cmd_addr = iomap[2] + 8; |
247 | ioaddr->altstatus_addr = | 250 | ioaddr->altstatus_addr = |
@@ -250,6 +253,13 @@ static int uli_init_one (struct pci_dev *pdev, const struct pci_device_id *ent) | |||
250 | ioaddr->bmdma_addr = iomap[4] + 24; | 253 | ioaddr->bmdma_addr = iomap[4] + 24; |
251 | hpriv->scr_cfg_addr[3] = ULI5287_BASE + ULI5287_OFFS*5; | 254 | hpriv->scr_cfg_addr[3] = ULI5287_BASE + ULI5287_OFFS*5; |
252 | ata_std_ports(ioaddr); | 255 | ata_std_ports(ioaddr); |
256 | |||
257 | ata_port_desc(host->ports[2], | ||
258 | "cmd 0x%llx ctl 0x%llx bmdma 0x%llx", | ||
259 | (unsigned long long)pci_resource_start(pdev, 2) + 9, | ||
260 | ((unsigned long long)pci_resource_start(pdev, 3) | ATA_PCI_CTL_OFS) + 4, | ||
261 | (unsigned long long)pci_resource_start(pdev, 4) + 24); | ||
262 | |||
253 | break; | 263 | break; |
254 | 264 | ||
255 | case uli_5289: | 265 | case uli_5289: |