From: Russell King Date: Wed, 26 Jun 2013 22:49:11 +0000 (+0100) Subject: DMA-API: usb: ssb-hcd: replace dma_set_mask()+dma_set_coherent_mask() with new helper X-Git-Tag: Ubuntu-5.2.0-15.16~14565^2~31 X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=01edb5e12c7fd2170b1969a455442e8fd17cfe54;p=mirror_ubuntu-eoan-kernel.git 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 --- 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);