Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux...

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

diff --git a/drivers/ata/pata_winbond.c b/drivers/ata/pata_winbond.c
index 9bafae9d5fe06e8aa0512f658cb05823abdf656a..6e52a3573fbfd105361b673b99f2012bc9d4219d 100644 (file)
--- a/drivers/ata/pata_winbond.c
+++ b/drivers/ata/pata_winbond.c
@@ -116,7 +116,7 @@ static unsigned int winbond_data_xfer(struct ata_device *dev,
                        buflen += 4 - slop;
                }
        } else
-               buflen = ata_data_xfer(dev, buf, buflen, rw);
+               buflen = ata_sff_data_xfer(dev, buf, buflen, rw);
 
        return buflen;
 }
@@ -126,29 +126,10 @@ static struct scsi_host_template winbond_sht = {
 };
 
 static struct ata_port_operations winbond_port_ops = {
-       .set_piomode    = winbond_set_piomode,
-
-       .tf_load        = ata_tf_load,
-       .tf_read        = ata_tf_read,
-       .check_status   = ata_check_status,
-       .exec_command   = ata_exec_command,
-       .dev_select     = ata_std_dev_select,
-
-       .freeze         = ata_bmdma_freeze,
-       .thaw           = ata_bmdma_thaw,
-       .error_handler  = ata_bmdma_error_handler,
-       .post_internal_cmd = ata_bmdma_post_internal_cmd,
+       .inherits       = &ata_sff_port_ops,
+       .sff_data_xfer  = winbond_data_xfer,
        .cable_detect   = ata_cable_40wire,
-
-       .qc_prep        = ata_qc_prep,
-       .qc_issue       = ata_qc_issue_prot,
-
-       .data_xfer      = winbond_data_xfer,
-
-       .irq_clear      = ata_noop_irq_clear,
-       .irq_on         = ata_irq_on,
-
-       .port_start     = ata_sff_port_start,
+       .set_piomode    = winbond_set_piomode,
 };
 
 /**
@@ -217,7 +198,7 @@ static __init int winbond_init_one(unsigned long port)
                ap->ioaddr.cmd_addr = cmd_addr;
                ap->ioaddr.altstatus_addr = ctl_addr;
                ap->ioaddr.ctl_addr = ctl_addr;
-               ata_std_ports(&ap->ioaddr);
+               ata_sff_std_ports(&ap->ioaddr);
 
                /* hook in a private data structure per channel */
                host->private_data = &winbond_data[nr_winbond_host];
@@ -225,7 +206,7 @@ static __init int winbond_init_one(unsigned long port)
                winbond_data[nr_winbond_host].platform_dev = pdev;
 
                /* activate */
-               rc = ata_host_activate(host, 14 + i, ata_interrupt, 0,
+               rc = ata_host_activate(host, 14 + i, ata_sff_interrupt, 0,
                                       &winbond_sht);
                if (rc)
                        goto err_unregister;