summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTejun Heo <tj@kernel.org>2010-05-10 21:41:25 +0200
committerJeff Garzik <jgarzik@redhat.com>2010-05-14 22:38:38 -0400
commit904924b020c794133607536b346aae268584d0af (patch)
treedec01625e8ffe775b6f66ea909758f590537832b
parentc4acf99bdebb84b21cf2d12521f990bbfe5d5500 (diff)
downloadop-kernel-dev-904924b020c794133607536b346aae268584d0af.zip
op-kernel-dev-904924b020c794133607536b346aae268584d0af.tar.gz
pata_sch: use ata_pci_sff_init_one()
pata_sch is standard SFF. No reason to open code init. Use ata_pci_sff_init_one() instead. Signed-off-by: Tejun Heo <tj@kernel.org> Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
-rw-r--r--drivers/ata/pata_sch.c12
1 files changed, 1 insertions, 11 deletions
diff --git a/drivers/ata/pata_sch.c b/drivers/ata/pata_sch.c
index 99cceb45..86b3d01 100644
--- 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_sff_init_one(pdev, ppi, &sch_sht, NULL, 0);
}
static int __init sch_init(void)
OpenPOWER on IntegriCloud