Merge branch 'next' of git://git.infradead.org/users/vkoul/slave-dma

torvalds · torvalds · commit 3333222484dc · 2015-05-03T10:49:04.000-07:00
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
diff --git a/drivers/dma/Kconfig b/drivers/dma/Kconfig
@@ -437,6 +437,7 @@ config IMG_MDC_DMA
 
 config XGENE_DMA
 	tristate "APM X-Gene DMA support"
+	depends on ARCH_XGENE || COMPILE_TEST
 	select DMA_ENGINE
 	select DMA_ENGINE_RAID
 	select ASYNC_TX_ENABLE_CHANNEL_SWITCH
diff --git a/drivers/dma/dmaengine.c b/drivers/dma/dmaengine.c
@@ -571,11 +571,15 @@ struct dma_chan *dma_get_any_slave_channel(struct dma_device *device)
 
 	chan = private_candidate(&mask, device, NULL, NULL);
 	if (chan) {
+		dma_cap_set(DMA_PRIVATE, device->cap_mask);
+		device->privatecnt++;
 		err = dma_chan_get(chan);
 		if (err) {
 			pr_debug("%s: failed to get %s: (%d)\n",
 				__func__, dma_chan_name(chan), err);
 			chan = NULL;
+			if (--device->privatecnt == 0)
+				dma_cap_clear(DMA_PRIVATE, device->cap_mask);
 		}
 	}
 
diff --git a/drivers/dma/sh/usb-dmac.c b/drivers/dma/sh/usb-dmac.c
@@ -673,6 +673,7 @@ static struct dma_chan *usb_dmac_of_xlate(struct of_phandle_args *dma_spec,
  * Power management
  */
 
+#ifdef CONFIG_PM
 static int usb_dmac_runtime_suspend(struct device *dev)
 {
 	struct usb_dmac *dmac = dev_get_drvdata(dev);
@@ -690,6 +691,7 @@ static int usb_dmac_runtime_resume(struct device *dev)
 
 	return usb_dmac_init(dmac);
 }
+#endif /* CONFIG_PM */
 
 static const struct dev_pm_ops usb_dmac_pm = {
 	SET_RUNTIME_PM_OPS(usb_dmac_runtime_suspend, usb_dmac_runtime_resume,

Original file line number	Diff line number	Diff line change
`@@ -571,11 +571,15 @@ struct dma_chan dma_get_any_slave_channel(struct dma_device device)`
`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`
Original file line number	Diff line number	Diff line change
`@@ -673,6 +673,7 @@ static struct dma_chan usb_dmac_of_xlate(struct of_phandle_args dma_spec,`
`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);`
`@@ -690,6 +691,7 @@ static int usb_dmac_runtime_resume(struct device *dev)`
`690`	`691`
`691`	`692`	`return usb_dmac_init(dmac);`
`692`	`693`	`}`
	`694`	`+#endif /* CONFIG_PM */`
`693`	`695`
`694`	`696`	`static const struct dev_pm_ops usb_dmac_pm = {`
`695`	`697`	`SET_RUNTIME_PM_OPS(usb_dmac_runtime_suspend, usb_dmac_runtime_resume,`