diff options
author | Tejun Heo <tj@kernel.org> | 2010-05-19 22:10:22 +0200 |
---|---|---|
committer | Jeff Garzik <jgarzik@redhat.com> | 2010-05-25 19:40:30 -0400 |
commit | 1c5afdf7a629d2e77de8dd043b97a33dcd7e6dfa (patch) | |
tree | 9f29bfdd32dd1bf497167cd7a8f596c7680059dd /drivers/ata/sata_nv.c | |
parent | c3b2889424c26f3b42962b6f39aabb4f1fd1b576 (diff) | |
download | op-kernel-dev-1c5afdf7a629d2e77de8dd043b97a33dcd7e6dfa.zip op-kernel-dev-1c5afdf7a629d2e77de8dd043b97a33dcd7e6dfa.tar.gz |
libata-sff: separate out BMDMA init
Separate out ata_pci_bmdma_prepare_host() and ata_pci_bmdma_init_one()
from their SFF counterparts. SFF ones no longer try to initialize
BMDMA or set PCI master.
Signed-off-by: Tejun Heo <tj@kernel.org>
Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
Diffstat (limited to 'drivers/ata/sata_nv.c')
-rw-r--r-- | drivers/ata/sata_nv.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/ata/sata_nv.c b/drivers/ata/sata_nv.c index 4269b99..6fd1147 100644 --- a/drivers/ata/sata_nv.c +++ b/drivers/ata/sata_nv.c @@ -2430,7 +2430,7 @@ static int nv_init_one(struct pci_dev *pdev, const struct pci_device_id *ent) ppi[0] = &nv_port_info[type]; ipriv = ppi[0]->private_data; - rc = ata_pci_sff_prepare_host(pdev, ppi, &host); + rc = ata_pci_bmdma_prepare_host(pdev, ppi, &host); if (rc) return rc; |