lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

DMA-API: net: b43: replace dma_set_mask()+dma_set_coherent_mask() with new helper

Browse Source 
Replace the following sequence:

	dma_set_mask(dev, mask);
	dma_set_coherent_mask(dev, mask);

with a call to the new helper dma_set_mask_and_coherent().

Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
This commit is contained in:
Russell King
2013-06-26 23:49:11 +01:00
parent 9663dedafa
commit e1390a2adc
1 changed files with 3 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
drivers/net/wireless/b43/dma.c
View File

@@ -1065,12 +1065,9 @@ static int b43_dma_set_mask(struct b43_wldev *dev, u64 mask)
/* Try to set the DMA mask. If it fails, try falling back to a /* Try to set the DMA mask. If it fails, try falling back to a
* lower mask, as we can always also support a lower one. */ * lower mask, as we can always also support a lower one. */
while (1) { while (1) {
err = dma_set_mask(dev->dev->dma_dev, mask); err = dma_set_mask_and_coherent(dev->dev->dma_dev, mask);
if (!err) { if (!err)
err = dma_set_coherent_mask(dev->dev->dma_dev, mask); break;
if (!err)
break;
}
if (mask == DMA_BIT_MASK(64)) { if (mask == DMA_BIT_MASK(64)) {
mask = DMA_BIT_MASK(32); mask = DMA_BIT_MASK(32);
fallback = true; fallback = true;