DMA-API: net: b43: replace dma_set_mask()+dma_set_coherent_mask() with new helper
authorRussell King <rmk+kernel@arm.linux.org.uk>
Wed, 26 Jun 2013 22:49:11 +0000 (23:49 +0100)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Sat, 21 Sep 2013 20:02:22 +0000 (21:02 +0100)
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>
drivers/net/wireless/b43/dma.c

index c51d2dc..1d7982a 100644 (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
         * 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;