diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2013-06-27 00:49:11 +0200 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2013-09-21 22:02:22 +0200 |
| commit | e1390a2adc72c907fb7a779d0111efa37b033dec (patch) | |
| tree | 3bb2c3d75cccc455d3adcc1eb75a57bc5bc61729 /drivers/net/wireless/b43 | |
| parent | DMA-API: net: sfc/efx.c: replace dma_set_mask()+dma_set_coherent_mask() with ... (diff) | |
| download | linux-e1390a2adc72c907fb7a779d0111efa37b033dec.tar.xz linux-e1390a2adc72c907fb7a779d0111efa37b033dec.zip | |
DMA-API: net: b43: replace dma_set_mask()+dma_set_coherent_mask() with new helper
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>
Diffstat (limited to 'drivers/net/wireless/b43')
| -rw-r--r-- | drivers/net/wireless/b43/dma.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/drivers/net/wireless/b43/dma.c b/drivers/net/wireless/b43/dma.c index c51d2dc489e4..1d7982afc0ad 100644 --- a/drivers/net/wireless/b43/dma.c +++ b/drivers/net/wireless/b43/dma.c @@ -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 * lower mask, as we can always also support a lower one. */ while (1) { - err = dma_set_mask(dev->dev->dma_dev, mask); - if (!err) { - err = dma_set_coherent_mask(dev->dev->dma_dev, mask); - if (!err) - break; - } + err = dma_set_mask_and_coherent(dev->dev->dma_dev, mask); + if (!err) + break; if (mask == DMA_BIT_MASK(64)) { mask = DMA_BIT_MASK(32); fallback = true; |