diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2013-06-26 19:04:29 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2013-09-21 21:01:50 +0100 |
| commit | 4011f9f76683b7f30965c960ea45500acc200880 (patch) | |
| tree | 4175aac18bf49ca13922a25fea4d24d11b00e417 | |
| parent | 53567aa4e00399aa59339bba81b285a5b95f425c (diff) | |
| download | op-kernel-dev-4011f9f76683b7f30965c960ea45500acc200880.zip op-kernel-dev-4011f9f76683b7f30965c960ea45500acc200880.tar.gz | |
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 <rmk+kernel@arm.linux.org.uk>
| -rw-r--r-- | drivers/net/ethernet/broadcom/b44.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/net/ethernet/broadcom/b44.c b/drivers/net/ethernet/broadcom/b44.c index 9b017d9..b4d2018 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; |
