diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2013-06-26 23:49:11 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2013-09-21 21:02:23 +0100 |
| commit | de71f988003a2e0b3d5b5a3519e9426053b5dda5 (patch) | |
| tree | 4b95c7ae4436f6153b0c6df53b8086722ed9b390 | |
| parent | e1390a2adc72c907fb7a779d0111efa37b033dec (diff) | |
| download | op-kernel-dev-de71f988003a2e0b3d5b5a3519e9426053b5dda5.zip op-kernel-dev-de71f988003a2e0b3d5b5a3519e9426053b5dda5.tar.gz | |
DMA-API: net: b43legacy: 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>
| -rw-r--r-- | drivers/net/wireless/b43legacy/dma.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/drivers/net/wireless/b43legacy/dma.c b/drivers/net/wireless/b43legacy/dma.c index 42eb26c..b2ed179 100644 --- a/drivers/net/wireless/b43legacy/dma.c +++ b/drivers/net/wireless/b43legacy/dma.c @@ -806,12 +806,9 @@ static int b43legacy_dma_set_mask(struct b43legacy_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; |
