diff options
author | Tejun Heo <htejun@gmail.com> | 2008-03-25 09:16:42 -0400 |
---|---|---|
committer | Jeff Garzik <jgarzik@redhat.com> | 2008-04-17 15:44:18 -0400 |
commit | 071ce34d57924edb76b76f7de460eb4991463959 (patch) | |
tree | 10400b05bd2649fe25a8c3aa4d41c08bd29c6347 /drivers/ata/libata-sff.c | |
parent | 624d5c514eed18d5a93062e9d86d67065175f30a (diff) |
libata: move ata_pci_default_filter() out of CONFIG_PCI
ata_pci_default_filter() doesn't really have anything to do with PCI.
It's generally applicable to BMDMA controllers. Move it out of
CONFIG_PCI.
Signed-off-by: Tejun Heo <htejun@gmail.com>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
Diffstat (limited to 'drivers/ata/libata-sff.c')
-rw-r--r-- | drivers/ata/libata-sff.c | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/drivers/ata/libata-sff.c b/drivers/ata/libata-sff.c index 840ae6da59bc..ebdd46bc13c4 100644 --- a/drivers/ata/libata-sff.c +++ b/drivers/ata/libata-sff.c | |||
@@ -2117,6 +2117,16 @@ void ata_std_ports(struct ata_ioports *ioaddr) | |||
2117 | ioaddr->command_addr = ioaddr->cmd_addr + ATA_REG_CMD; | 2117 | ioaddr->command_addr = ioaddr->cmd_addr + ATA_REG_CMD; |
2118 | } | 2118 | } |
2119 | 2119 | ||
2120 | unsigned long ata_pci_default_filter(struct ata_device *adev, unsigned long xfer_mask) | ||
2121 | { | ||
2122 | /* Filter out DMA modes if the device has been configured by | ||
2123 | the BIOS as PIO only */ | ||
2124 | |||
2125 | if (adev->link->ap->ioaddr.bmdma_addr == NULL) | ||
2126 | xfer_mask &= ~(ATA_MASK_MWDMA | ATA_MASK_UDMA); | ||
2127 | return xfer_mask; | ||
2128 | } | ||
2129 | |||
2120 | /** | 2130 | /** |
2121 | * ata_bmdma_setup - Set up PCI IDE BMDMA transaction | 2131 | * ata_bmdma_setup - Set up PCI IDE BMDMA transaction |
2122 | * @qc: Info associated with this ATA transaction. | 2132 | * @qc: Info associated with this ATA transaction. |
@@ -2335,16 +2345,6 @@ int ata_pci_clear_simplex(struct pci_dev *pdev) | |||
2335 | return 0; | 2345 | return 0; |
2336 | } | 2346 | } |
2337 | 2347 | ||
2338 | unsigned long ata_pci_default_filter(struct ata_device *adev, unsigned long xfer_mask) | ||
2339 | { | ||
2340 | /* Filter out DMA modes if the device has been configured by | ||
2341 | the BIOS as PIO only */ | ||
2342 | |||
2343 | if (adev->link->ap->ioaddr.bmdma_addr == NULL) | ||
2344 | xfer_mask &= ~(ATA_MASK_MWDMA | ATA_MASK_UDMA); | ||
2345 | return xfer_mask; | ||
2346 | } | ||
2347 | |||
2348 | /** | 2348 | /** |
2349 | * ata_pci_init_bmdma - acquire PCI BMDMA resources and init ATA host | 2349 | * ata_pci_init_bmdma - acquire PCI BMDMA resources and init ATA host |
2350 | * @host: target ATA host | 2350 | * @host: target ATA host |
@@ -2725,6 +2725,7 @@ EXPORT_SYMBOL_GPL(ata_sff_port_ops); | |||
2725 | EXPORT_SYMBOL_GPL(ata_bmdma_port_ops); | 2725 | EXPORT_SYMBOL_GPL(ata_bmdma_port_ops); |
2726 | EXPORT_SYMBOL_GPL(ata_qc_prep); | 2726 | EXPORT_SYMBOL_GPL(ata_qc_prep); |
2727 | EXPORT_SYMBOL_GPL(ata_dumb_qc_prep); | 2727 | EXPORT_SYMBOL_GPL(ata_dumb_qc_prep); |
2728 | EXPORT_SYMBOL_GPL(ata_pci_default_filter); | ||
2728 | EXPORT_SYMBOL_GPL(ata_std_dev_select); | 2729 | EXPORT_SYMBOL_GPL(ata_std_dev_select); |
2729 | EXPORT_SYMBOL_GPL(ata_check_status); | 2730 | EXPORT_SYMBOL_GPL(ata_check_status); |
2730 | EXPORT_SYMBOL_GPL(ata_altstatus); | 2731 | EXPORT_SYMBOL_GPL(ata_altstatus); |
@@ -2760,7 +2761,6 @@ EXPORT_SYMBOL_GPL(ata_bmdma_status); | |||
2760 | EXPORT_SYMBOL_GPL(ata_bus_reset); | 2761 | EXPORT_SYMBOL_GPL(ata_bus_reset); |
2761 | #ifdef CONFIG_PCI | 2762 | #ifdef CONFIG_PCI |
2762 | EXPORT_SYMBOL_GPL(ata_pci_clear_simplex); | 2763 | EXPORT_SYMBOL_GPL(ata_pci_clear_simplex); |
2763 | EXPORT_SYMBOL_GPL(ata_pci_default_filter); | ||
2764 | EXPORT_SYMBOL_GPL(ata_pci_init_bmdma); | 2764 | EXPORT_SYMBOL_GPL(ata_pci_init_bmdma); |
2765 | EXPORT_SYMBOL_GPL(ata_pci_init_sff_host); | 2765 | EXPORT_SYMBOL_GPL(ata_pci_init_sff_host); |
2766 | EXPORT_SYMBOL_GPL(ata_pci_prepare_sff_host); | 2766 | EXPORT_SYMBOL_GPL(ata_pci_prepare_sff_host); |