summaryrefslogtreecommitdiff
path: root/drivers/base
diff options
context:
space:
mode:
authorRobin Murphy <robin.murphy@arm.com>2018-12-06 13:20:49 -0800
committerChristoph Hellwig <hch@lst.de>2018-12-13 21:06:13 +0100
commite5361ca29f2fea345c08d2b5cb5e3b1840cbafb8 (patch)
tree697be029cf1427e187d1547d376c719b185b632b /drivers/base
parent90ac706e98fcb24fb0b0a259558987f33cc2f0f6 (diff)
ACPI / scan: Refactor _CCA enforcement
Rather than checking the DMA attribute at each callsite, just pass it through for acpi_dma_configure() to handle directly. That can then deal with the relatively exceptional DEV_DMA_NOT_SUPPORTED case by explicitly installing dummy DMA ops instead of just skipping setup entirely. This will then free up the dev->dma_ops == NULL case for some valuable fastpath optimisations. Signed-off-by: Robin Murphy <robin.murphy@arm.com> Reviewed-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com> Acked-by: Jesper Dangaard Brouer <brouer@redhat.com> Tested-by: Jesper Dangaard Brouer <brouer@redhat.com> Signed-off-by: Christoph Hellwig <hch@lst.de> Tested-by: Tony Luck <tony.luck@intel.com>
Diffstat (limited to 'drivers/base')
-rw-r--r--drivers/base/platform.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/base/platform.c b/drivers/base/platform.c
index eae841935a45..c1ddf191711e 100644
--- a/drivers/base/platform.c
+++ b/drivers/base/platform.c
@@ -1138,8 +1138,7 @@ int platform_dma_configure(struct device *dev)
ret = of_dma_configure(dev, dev->of_node, true);
} else if (has_acpi_companion(dev)) {
attr = acpi_get_dma_attr(to_acpi_device_node(dev->fwnode));
- if (attr != DEV_DMA_NOT_SUPPORTED)
- ret = acpi_dma_configure(dev, attr);
+ ret = acpi_dma_configure(dev, attr);
}
return ret;