diff options
author | Russell King <rmk+kernel@arm.linux.org.uk> | 2013-06-26 23:49:11 +0100 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2013-10-31 14:48:36 +0000 |
commit | 01edb5e12c7fd2170b1969a455442e8fd17cfe54 (patch) | |
tree | d0c6d88493c8e7b6f7293d51ef67e67bed53385e /drivers/usb | |
parent | d288059e0aedcee0d55074b81ef286c7f255e146 (diff) | |
download | blackbird-op-linux-01edb5e12c7fd2170b1969a455442e8fd17cfe54.tar.gz blackbird-op-linux-01edb5e12c7fd2170b1969a455442e8fd17cfe54.zip |
DMA-API: usb: ssb-hcd: 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/ssb-hcd.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/usb/host/ssb-hcd.c b/drivers/usb/host/ssb-hcd.c index 74af2c6287d2..0196f766df73 100644 --- a/drivers/usb/host/ssb-hcd.c +++ b/drivers/usb/host/ssb-hcd.c @@ -163,8 +163,7 @@ static int ssb_hcd_probe(struct ssb_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 ssb_hcd_device), GFP_KERNEL); |