diff options
author | Tejun Heo <tj@kernel.org> | 2010-05-19 16:10:22 -0400 |
---|---|---|
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) |
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 4269b9915e43..6fd114784116 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) | |||
2430 | 2430 | ||
2431 | ppi[0] = &nv_port_info[type]; | 2431 | ppi[0] = &nv_port_info[type]; |
2432 | ipriv = ppi[0]->private_data; | 2432 | ipriv = ppi[0]->private_data; |
2433 | rc = ata_pci_sff_prepare_host(pdev, ppi, &host); | 2433 | rc = ata_pci_bmdma_prepare_host(pdev, ppi, &host); |
2434 | if (rc) | 2434 | if (rc) |
2435 | return rc; | 2435 | return rc; |
2436 | 2436 | ||