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_via.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_via.c')
| -rw-r--r-- | drivers/ata/sata_via.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/ata/sata_via.c b/drivers/ata/sata_via.c index 7da5d019873b..101d8c219caf 100644 --- a/drivers/ata/sata_via.c +++ b/drivers/ata/sata_via.c | |||
| @@ -463,7 +463,7 @@ static int vt6420_prepare_host(struct pci_dev *pdev, struct ata_host **r_host) | |||
| 463 | struct ata_host *host; | 463 | struct ata_host *host; |
| 464 | int rc; | 464 | int rc; |
| 465 | 465 | ||
| 466 | rc = ata_pci_sff_prepare_host(pdev, ppi, &host); | 466 | rc = ata_pci_bmdma_prepare_host(pdev, ppi, &host); |
| 467 | if (rc) | 467 | if (rc) |
| 468 | return rc; | 468 | return rc; |
| 469 | *r_host = host; | 469 | *r_host = host; |
| @@ -520,7 +520,7 @@ static int vt8251_prepare_host(struct pci_dev *pdev, struct ata_host **r_host) | |||
| 520 | struct ata_host *host; | 520 | struct ata_host *host; |
| 521 | int i, rc; | 521 | int i, rc; |
| 522 | 522 | ||
| 523 | rc = ata_pci_sff_prepare_host(pdev, ppi, &host); | 523 | rc = ata_pci_bmdma_prepare_host(pdev, ppi, &host); |
| 524 | if (rc) | 524 | if (rc) |
| 525 | return rc; | 525 | return rc; |
| 526 | *r_host = host; | 526 | *r_host = host; |