summaryrefslogtreecommitdiffstats
path: root/drivers/usb
diff options
context:
space:
mode:
authorRussell King <rmk+kernel@arm.linux.org.uk>2013-06-26 23:49:11 +0100
committerRussell King <rmk+kernel@arm.linux.org.uk>2013-10-31 14:48:34 +0000
commitd288059e0aedcee0d55074b81ef286c7f255e146 (patch)
tree44b447b0aa51fa79df04defa5c8815824be8c32a /drivers/usb
parent68788979c2fbb1ce8691757b9d27231b4c5d08a8 (diff)
downloadtalos-op-linux-d288059e0aedcee0d55074b81ef286c7f255e146.tar.gz
talos-op-linux-d288059e0aedcee0d55074b81ef286c7f255e146.zip
DMA-API: usb: bcma: 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>
Diffstat (limited to 'drivers/usb')
-rw-r--r--drivers/usb/host/bcma-hcd.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/usb/host/bcma-hcd.c b/drivers/usb/host/bcma-hcd.c
index df13d425e9c5..205f4a336583 100644
--- a/drivers/usb/host/bcma-hcd.c
+++ b/drivers/usb/host/bcma-hcd.c
@@ -227,8 +227,7 @@ static int bcma_hcd_probe(struct bcma_device *dev)
/* TODO: Probably need checks here; is the core connected? */
- if (dma_set_mask(dev->dma_dev, DMA_BIT_MASK(32)) ||
- dma_set_coherent_mask(dev->dma_dev, DMA_BIT_MASK(32)))
+ if (dma_set_mask_and_coherent(dev->dma_dev, DMA_BIT_MASK(32)))
return -EOPNOTSUPP;
usb_dev = kzalloc(sizeof(struct bcma_hcd_device), GFP_KERNEL);
OpenPOWER on IntegriCloud