Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-10 06:01:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

dma-mapping: reflow dma_supported

Browse Source 
dma_supported has become too much spaghetti for my taste.  Reflow it to
remove the duplicate use_dma_iommu condition and make the main path more
obvious.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Leon Romanovsky <leon@kernel.org>
This commit is contained in:
Christoph Hellwig 2024-09-12 09:21:18 +02:00
parent f45cfab28f
commit a5fb217f13
1 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
kernel/dma/mapping.c
View File

@ -841,22 +841,25 @@ static int dma_supported(struct device *dev, u64 mask)
{
const struct dma_map_ops *ops = get_dma_ops(dev);
if (WARN_ON(ops && use_dma_iommu(dev)))
if (use_dma_iommu(dev)) {
if (WARN_ON(ops))
return false;
if (use_dma_iommu(dev))
return true;
}
/*
* ->dma_supported sets the bypass flag, so we must always call
* into the method here unless the device is truly direct mapped.
* ->dma_supported sets and clears the bypass flag, so ignore it here
* and always call into the method if there is one.
*/
if (!ops)
return dma_direct_supported(dev, mask);
if (ops) {
if (!ops->dma_supported)
return 1;
return true;
return ops->dma_supported(dev, mask);
}
return dma_direct_supported(dev, mask);
}
bool dma_pci_p2pdma_supported(struct device *dev)
{
const struct dma_map_ops *ops = get_dma_ops(dev);