DMA-API: net: broadcom/b44: replace dma_set_mask()+dma_set_coherent_mask() with new...
authorRussell King <rmk+kernel@arm.linux.org.uk>
Wed, 26 Jun 2013 18:04:29 +0000 (19:04 +0100)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Sat, 21 Sep 2013 20:01:50 +0000 (21:01 +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/ethernet/broadcom/b44.c

index 9b017d9c58e94e5ab671aeda2cfcc969cc561c6e..b4d20182549b6caa43892c26917bc80d84b35705 100644 (file)
@@ -2183,8 +2183,7 @@ static int b44_init_one(struct ssb_device *sdev,
                goto err_out_free_dev;
        }
 
-       if (dma_set_mask(sdev->dma_dev, DMA_BIT_MASK(30)) ||
-           dma_set_coherent_mask(sdev->dma_dev, DMA_BIT_MASK(30))) {
+       if (dma_set_mask_and_coherent(sdev->dma_dev, DMA_BIT_MASK(30))) {
                dev_err(sdev->dev,
                        "Required 30BIT DMA mask unsupported by the system\n");
                goto err_out_powerdown;