Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/async_tx

[pandora-kernel.git] / drivers / ata / pata_sch.c

diff --git a/drivers/ata/pata_sch.c b/drivers/ata/pata_sch.c
index 99cceb4..e97b32f 100644 (file)
--- a/drivers/ata/pata_sch.c
+++ b/drivers/ata/pata_sch.c
@@ -174,22 +174,12 @@ static int __devinit sch_init_one(struct pci_dev *pdev,
 {
        static int printed_version;
        const struct ata_port_info *ppi[] = { &sch_port_info, NULL };
-       struct ata_host *host;
-       int rc;
 
        if (!printed_version++)
                dev_printk(KERN_DEBUG, &pdev->dev,
                           "version " DRV_VERSION "\n");
 
-       /* enable device and prepare host */
-       rc = pcim_enable_device(pdev);
-       if (rc)
-               return rc;
-       rc = ata_pci_sff_prepare_host(pdev, ppi, &host);
-       if (rc)
-               return rc;
-       pci_set_master(pdev);
-       return ata_pci_sff_activate_host(host, ata_sff_interrupt, &sch_sht);
+       return ata_pci_bmdma_init_one(pdev, ppi, &sch_sht, NULL, 0);
 }
 
 static int __init sch_init(void)