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/pata_optidma.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/pata_optidma.c')
| -rw-r--r-- | drivers/ata/pata_optidma.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/ata/pata_optidma.c b/drivers/ata/pata_optidma.c index 76b7d12b1e8d..0852cd07de08 100644 --- a/drivers/ata/pata_optidma.c +++ b/drivers/ata/pata_optidma.c | |||
| @@ -429,7 +429,7 @@ static int optidma_init_one(struct pci_dev *dev, const struct pci_device_id *id) | |||
| 429 | if (optiplus_with_udma(dev)) | 429 | if (optiplus_with_udma(dev)) |
| 430 | ppi[0] = &info_82c700_udma; | 430 | ppi[0] = &info_82c700_udma; |
| 431 | 431 | ||
| 432 | return ata_pci_sff_init_one(dev, ppi, &optidma_sht, NULL, 0); | 432 | return ata_pci_bmdma_init_one(dev, ppi, &optidma_sht, NULL, 0); |
| 433 | } | 433 | } |
| 434 | 434 | ||
| 435 | static const struct pci_device_id optidma[] = { | 435 | static const struct pci_device_id optidma[] = { |