ahci: move host flags over to pi.private_data

[linux-2.6-omap-h63xx.git] / drivers / ata / sata_uli.c

diff --git a/drivers/ata/sata_uli.c b/drivers/ata/sata_uli.c
index 78c28512f01c634e2050256a976fe45721f531fb..d394da085ae45e57f3909560a1d18e02be809b80 100644 (file)
--- a/drivers/ata/sata_uli.c
+++ b/drivers/ata/sata_uli.c
@@ -36,7 +36,7 @@
 #include <linux/libata.h>
 
 #define DRV_NAME       "sata_uli"
-#define DRV_VERSION    "1.2"
+#define DRV_VERSION    "1.3"
 
 enum {
        uli_5289                = 0,
@@ -94,8 +94,6 @@ static struct scsi_host_template uli_sht = {
 };
 
 static const struct ata_port_operations uli_ops = {
-       .port_disable           = ata_port_disable,
-
        .tf_load                = ata_tf_load,
        .tf_read                = ata_tf_read,
        .check_status           = ata_check_status,
@@ -117,7 +115,6 @@ static const struct ata_port_operations uli_ops = {
 
        .irq_clear              = ata_bmdma_irq_clear,
        .irq_on                 = ata_irq_on,
-       .irq_ack                = ata_irq_ack,
 
        .scr_read               = uli_scr_read,
        .scr_write              = uli_scr_write,
@@ -242,6 +239,12 @@ static int uli_init_one (struct pci_dev *pdev, const struct pci_device_id *ent)
                hpriv->scr_cfg_addr[2] = ULI5287_BASE + ULI5287_OFFS*4;
                ata_std_ports(ioaddr);
 
+               ata_port_desc(host->ports[2],
+                       "cmd 0x%llx ctl 0x%llx bmdma 0x%llx",
+                       (unsigned long long)pci_resource_start(pdev, 0) + 8,
+                       ((unsigned long long)pci_resource_start(pdev, 1) | ATA_PCI_CTL_OFS) + 4,
+                       (unsigned long long)pci_resource_start(pdev, 4) + 16);
+
                ioaddr = &host->ports[3]->ioaddr;
                ioaddr->cmd_addr = iomap[2] + 8;
                ioaddr->altstatus_addr =
@@ -250,6 +253,13 @@ static int uli_init_one (struct pci_dev *pdev, const struct pci_device_id *ent)
                ioaddr->bmdma_addr = iomap[4] + 24;
                hpriv->scr_cfg_addr[3] = ULI5287_BASE + ULI5287_OFFS*5;
                ata_std_ports(ioaddr);
+
+               ata_port_desc(host->ports[2],
+                       "cmd 0x%llx ctl 0x%llx bmdma 0x%llx",
+                       (unsigned long long)pci_resource_start(pdev, 2) + 9,
+                       ((unsigned long long)pci_resource_start(pdev, 3) | ATA_PCI_CTL_OFS) + 4,
+                       (unsigned long long)pci_resource_start(pdev, 4) + 24);
+
                break;
 
        case uli_5289: