diff options
author | Russell King <rmk+kernel@arm.linux.org.uk> | 2013-06-26 18:49:11 -0400 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2013-10-31 10:48:27 -0400 |
commit | 68788979c2fbb1ce8691757b9d27231b4c5d08a8 (patch) | |
tree | 5b15ed6685bacbac7912d32b56abd8059db39e3a | |
parent | e22f0e3fdc2b5b3a399df29c3b5991e35b690320 (diff) |
DMA-API: media: dt3155v4l: 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().
Acked-by: Hans Verkuil <hans.verkuil@cisco.com>
Acked-by: Mauro Carvalho Chehab <m.chehab@samsung.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
-rw-r--r-- | drivers/staging/media/dt3155v4l/dt3155v4l.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/drivers/staging/media/dt3155v4l/dt3155v4l.c b/drivers/staging/media/dt3155v4l/dt3155v4l.c index 90d6ac469355..081407be33ab 100644 --- a/drivers/staging/media/dt3155v4l/dt3155v4l.c +++ b/drivers/staging/media/dt3155v4l/dt3155v4l.c | |||
@@ -901,10 +901,7 @@ dt3155_probe(struct pci_dev *pdev, const struct pci_device_id *id) | |||
901 | int err; | 901 | int err; |
902 | struct dt3155_priv *pd; | 902 | struct dt3155_priv *pd; |
903 | 903 | ||
904 | err = dma_set_mask(&pdev->dev, DMA_BIT_MASK(32)); | 904 | err = dma_set_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(32)); |
905 | if (err) | ||
906 | return -ENODEV; | ||
907 | err = dma_set_coherent_mask(&pdev->dev, DMA_BIT_MASK(32)); | ||
908 | if (err) | 905 | if (err) |
909 | return -ENODEV; | 906 | return -ENODEV; |
910 | pd = kzalloc(sizeof(*pd), GFP_KERNEL); | 907 | pd = kzalloc(sizeof(*pd), GFP_KERNEL); |