diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2015-11-07 01:30:10 +0100 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2015-11-07 01:30:10 +0100 |
| commit | f2115faaf0df42623638dfbfc5bdaab6ef7375ab (patch) | |
| tree | f8bbd5a1ad3fbcb0b60e455d0dcf29a9fc25602c /include/linux/acpi.h | |
| parent | 0d51ce9ca1116e8f4dc87cb51db8dd250327e9bb (diff) | |
| parent | 29dbe1f0af88b4162d2b57e790db7a51ab061f35 (diff) | |
| download | linux-f2115faaf0df42623638dfbfc5bdaab6ef7375ab.tar.gz | |
Merge branch 'acpi-pci'
* acpi-pci:
PCI: ACPI: Add support for PCI device DMA coherency
PCI: OF: Move of_pci_dma_configure() to pci_dma_configure()
of/pci: Fix pci_get_host_bridge_device leak
device property: ACPI: Remove unused DMA APIs
device property: ACPI: Make use of the new DMA Attribute APIs
device property: Adding DMA Attribute APIs for Generic Devices
ACPI: Adding DMA Attribute APIs for ACPI Device
device property: Introducing enum dev_dma_attr
ACPI: Honor ACPI _CCA attribute setting
Conflicts:
drivers/crypto/ccp/ccp-platform.c
Diffstat (limited to 'include/linux/acpi.h')
| -rw-r--r-- | include/linux/acpi.h | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/include/linux/acpi.h b/include/linux/acpi.h index d6f95bb481d4..b729eb3f1137 100644 --- a/include/linux/acpi.h +++ b/include/linux/acpi.h @@ -596,11 +596,16 @@ static inline int acpi_device_modalias(struct device *dev, return -ENODEV; } -static inline bool acpi_check_dma(struct acpi_device *adev, bool *coherent) +static inline bool acpi_dma_supported(struct acpi_device *adev) { return false; } +static inline enum dev_dma_attr acpi_get_dma_attr(struct acpi_device *adev) +{ + return DEV_DMA_NOT_SUPPORTED; +} + #define ACPI_PTR(_ptr) (NULL) #endif /* !CONFIG_ACPI */ |