From: Russell King Date: Wed, 26 Jun 2013 18:04:29 +0000 (+0100) Subject: DMA-API: net: broadcom/b44: replace dma_set_mask()+dma_set_coherent_mask() with new... X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=4011f9f76683b7f30965c960ea45500acc200880;p=GitHub%2Fexynos8895%2Fandroid_kernel_samsung_universal8895.git DMA-API: net: broadcom/b44: 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 --- diff --git a/drivers/net/ethernet/broadcom/b44.c b/drivers/net/ethernet/broadcom/b44.c index 9b017d9c58e9..b4d20182549b 100644 --- a/drivers/net/ethernet/broadcom/b44.c +++ b/drivers/net/ethernet/broadcom/b44.c @@ -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;