Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge branch 'fixes' of git://git.infradead.org/users/vkoul/slave-dma
Pull dmaengine fixes from Vinod Koul:
"Two patches, the first by Andy to fix dw dmac runtime pm and second
one by me to fix the dmaengine headers in MAINTAINERS"
* 'fixes' of git://git.infradead.org/users/vkoul/slave-dma:
dmaengine: dw: balance PM runtime calls
MAINTAINERS: dmaengine: fix the header file for dmaengine
+6
-3
+1
-1
MAINTAINERS
+1
-1
MAINTAINERS
···
3183
3183
Q: https://patchwork.kernel.org/project/linux-dmaengine/list/
3184
3184
S: Maintained
3185
3185
F: drivers/dma/
3186
-
F: include/linux/dma*
3186
+
F: include/linux/dmaengine.h
3187
3187
F: Documentation/dmaengine/
3188
3188
T: git git://git.infradead.org/users/vkoul/slave-dma.git
3189
3189
-2
drivers/dma/dw/core.c
-2
drivers/dma/dw/core.c
···
1505
1505
dw->regs = chip->regs;
1506
1506
chip->dw = dw;
1507
1507
1508
-
pm_runtime_enable(chip->dev);
1509
1508
pm_runtime_get_sync(chip->dev);
1510
1509
1511
1510
dw_params = dma_read_byaddr(chip->regs, DW_PARAMS);
···
1702
1703
}
1703
1704
1704
1705
pm_runtime_put_sync_suspend(chip->dev);
1705
-
pm_runtime_disable(chip->dev);
1706
1706
return 0;
1707
1707
}
1708
1708
EXPORT_SYMBOL_GPL(dw_dma_remove);
+5
drivers/dma/dw/platform.c
+5
drivers/dma/dw/platform.c
···
15
15
#include <linux/module.h>
16
16
#include <linux/device.h>
17
17
#include <linux/clk.h>
18
+
#include <linux/pm_runtime.h>
18
19
#include <linux/platform_device.h>
19
20
#include <linux/dmaengine.h>
20
21
#include <linux/dma-mapping.h>
···
186
185
if (err)
187
186
return err;
188
187
188
+
pm_runtime_enable(&pdev->dev);
189
+
189
190
err = dw_dma_probe(chip, pdata);
190
191
if (err)
191
192
goto err_dw_dma_probe;
···
208
205
return 0;
209
206
210
207
err_dw_dma_probe:
208
+
pm_runtime_disable(&pdev->dev);
211
209
clk_disable_unprepare(chip->clk);
212
210
return err;
213
211
}
···
221
217
of_dma_controller_free(pdev->dev.of_node);
222
218
223
219
dw_dma_remove(chip);
220
+
pm_runtime_disable(&pdev->dev);
224
221
clk_disable_unprepare(chip->clk);
225
222
226
223
return 0;