Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge branch 'next' of git://git.infradead.org/users/vkoul/slave-dma
Pull slave dmaengine fixes from Vinod Koul:
"Here are the fixes in dmaengine subsystem for rc2:
- privatecnt fix for slave dma request API by Christopher
- warn fix for PM ifdef in usb-dmac by Geert
- fix hardware dependency for xgene by Jean"
* 'next' of git://git.infradead.org/users/vkoul/slave-dma:
dmaengine: increment privatecnt when using dma_get_any_slave_channel
dmaengine: xgene: Set hardware dependency
dmaengine: usb-dmac: Protect PM-only functions to kill warning
+7
+1
drivers/dma/Kconfig
+1
drivers/dma/Kconfig
+4
drivers/dma/dmaengine.c
+4
drivers/dma/dmaengine.c
···
571
571
572
572
chan = private_candidate(&mask, device, NULL, NULL);
573
573
if (chan) {
574
+
dma_cap_set(DMA_PRIVATE, device->cap_mask);
575
+
device->privatecnt++;
574
576
err = dma_chan_get(chan);
575
577
if (err) {
576
578
pr_debug("%s: failed to get %s: (%d)\n",
577
579
__func__, dma_chan_name(chan), err);
578
580
chan = NULL;
581
+
if (--device->privatecnt == 0)
582
+
dma_cap_clear(DMA_PRIVATE, device->cap_mask);
579
583
}
580
584
}
581
585
+2
drivers/dma/sh/usb-dmac.c
+2
drivers/dma/sh/usb-dmac.c
···
673
673
* Power management
674
674
*/
675
675
676
+
#ifdef CONFIG_PM
676
677
static int usb_dmac_runtime_suspend(struct device *dev)
677
678
{
678
679
struct usb_dmac *dmac = dev_get_drvdata(dev);
···
691
690
692
691
return usb_dmac_init(dmac);
693
692
}
693
+
#endif /* CONFIG_PM */
694
694
695
695
static const struct dev_pm_ops usb_dmac_pm = {
696
696
SET_RUNTIME_PM_OPS(usb_dmac_runtime_suspend, usb_dmac_runtime_resume,