aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/usb/gadget
diff options
context:
space:
mode:
authorRussell King <rmk+kernel@arm.linux.org.uk>2013-06-10 16:28:49 +0100
committerRussell King <rmk+kernel@arm.linux.org.uk>2013-10-31 14:49:01 +0000
commit22d9d8e8316d7f69046c8805ce9aa8d9c43d4e5b (patch)
tree08dac036c1fdeb9c49940b3a7760860849eee65c /drivers/usb/gadget
parentDMA-API: parport: parport_pc.c: use dma_coerce_mask_and_coherent() (diff)
downloadlinux-dev-22d9d8e8316d7f69046c8805ce9aa8d9c43d4e5b.tar.xz
linux-dev-22d9d8e8316d7f69046c8805ce9aa8d9c43d4e5b.zip
DMA-API: usb: use dma_set_coherent_mask()
The correct way for a driver to specify the coherent DMA mask is not to directly access the field in the struct device, but to use dma_set_coherent_mask(). Only arch and bus code should access this member directly. Convert all direct write accesses to using the correct API. Acked-by: Felipe Balbi <balbi@ti.com> Acked-by: Nicolas Ferre <nicolas.ferre@atmel.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'drivers/usb/gadget')
-rw-r--r--drivers/usb/gadget/lpc32xx_udc.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/usb/gadget/lpc32xx_udc.c b/drivers/usb/gadget/lpc32xx_udc.c
index 67128be1e1b7..6a2a65aa0057 100644
--- a/drivers/usb/gadget/lpc32xx_udc.c
+++ b/drivers/usb/gadget/lpc32xx_udc.c
@@ -3078,7 +3078,9 @@ static int __init lpc32xx_udc_probe(struct platform_device *pdev)
udc->isp1301_i2c_client->addr);
pdev->dev.dma_mask = &lpc32xx_usbd_dmamask;
- pdev->dev.coherent_dma_mask = DMA_BIT_MASK(32);
+ retval = dma_set_coherent_mask(&pdev->dev, DMA_BIT_MASK(32));
+ if (retval)
+ goto resource_fail;
udc->board = &lpc32xx_usbddata;