Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
gsplhtlxg
clone-Linux
提交
b8bb45cb
C
clone-Linux
项目概览
gsplhtlxg
/
clone-Linux
通知
2
Star
0
Fork
1
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
C
clone-Linux
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
b8bb45cb
编写于
10月 24, 2018
作者:
V
Vinod Koul
浏览文件
操作
浏览文件
下载
差异文件
Merge branch 'topic/dmam' into for-linus
上级
edc329fb
a436ff1e
变更
8
隐藏空白更改
内联
并排
Showing
8 changed file
with
16 addition
and
36 deletion
+16
-36
drivers/dma/dma-jz4780.c
drivers/dma/dma-jz4780.c
+2
-6
drivers/dma/dw-axi-dmac/dw-axi-dmac-platform.c
drivers/dma/dw-axi-dmac/dw-axi-dmac-platform.c
+1
-3
drivers/dma/mmp_tdma.c
drivers/dma/mmp_tdma.c
+2
-5
drivers/dma/mxs-dma.c
drivers/dma/mxs-dma.c
+1
-2
drivers/dma/pxa_dma.c
drivers/dma/pxa_dma.c
+2
-3
drivers/dma/st_fdma.c
drivers/dma/st_fdma.c
+2
-5
drivers/dma/ste_dma40.c
drivers/dma/ste_dma40.c
+5
-9
drivers/dma/stm32-mdma.c
drivers/dma/stm32-mdma.c
+1
-3
未找到文件。
drivers/dma/dma-jz4780.c
浏览文件 @
b8bb45cb
...
...
@@ -847,7 +847,7 @@ static int jz4780_dma_probe(struct platform_device *pdev)
jzchan
->
vchan
.
desc_free
=
jz4780_dma_desc_free
;
}
ret
=
dma_async_device_register
(
dd
);
ret
=
dma
enginem
_async_device_register
(
dd
);
if
(
ret
)
{
dev_err
(
dev
,
"failed to register device
\n
"
);
goto
err_disable_clk
;
...
...
@@ -858,15 +858,12 @@ static int jz4780_dma_probe(struct platform_device *pdev)
jzdma
);
if
(
ret
)
{
dev_err
(
dev
,
"failed to register OF DMA controller
\n
"
);
goto
err_
unregister_dev
;
goto
err_
disable_clk
;
}
dev_info
(
dev
,
"JZ4780 DMA controller initialised
\n
"
);
return
0
;
err_unregister_dev:
dma_async_device_unregister
(
dd
);
err_disable_clk:
clk_disable_unprepare
(
jzdma
->
clk
);
...
...
@@ -887,7 +884,6 @@ static int jz4780_dma_remove(struct platform_device *pdev)
for
(
i
=
0
;
i
<
JZ_DMA_NR_CHANNELS
;
i
++
)
tasklet_kill
(
&
jzdma
->
chan
[
i
].
vchan
.
task
);
dma_async_device_unregister
(
&
jzdma
->
dma_device
);
return
0
;
}
...
...
drivers/dma/dw-axi-dmac/dw-axi-dmac-platform.c
浏览文件 @
b8bb45cb
...
...
@@ -934,7 +934,7 @@ static int dw_probe(struct platform_device *pdev)
pm_runtime_put
(
chip
->
dev
);
ret
=
dma_async_device_register
(
&
dw
->
dma
);
ret
=
dma
enginem
_async_device_register
(
&
dw
->
dma
);
if
(
ret
)
goto
err_pm_disable
;
...
...
@@ -977,8 +977,6 @@ static int dw_remove(struct platform_device *pdev)
tasklet_kill
(
&
chan
->
vc
.
task
);
}
dma_async_device_unregister
(
&
dw
->
dma
);
return
0
;
}
...
...
drivers/dma/mmp_tdma.c
浏览文件 @
b8bb45cb
...
...
@@ -548,9 +548,6 @@ static void mmp_tdma_issue_pending(struct dma_chan *chan)
static
int
mmp_tdma_remove
(
struct
platform_device
*
pdev
)
{
struct
mmp_tdma_device
*
tdev
=
platform_get_drvdata
(
pdev
);
dma_async_device_unregister
(
&
tdev
->
device
);
return
0
;
}
...
...
@@ -714,7 +711,7 @@ static int mmp_tdma_probe(struct platform_device *pdev)
dma_set_mask
(
&
pdev
->
dev
,
DMA_BIT_MASK
(
64
));
platform_set_drvdata
(
pdev
,
tdev
);
ret
=
dma_async_device_register
(
&
tdev
->
device
);
ret
=
dma
enginem
_async_device_register
(
&
tdev
->
device
);
if
(
ret
)
{
dev_err
(
tdev
->
device
.
dev
,
"unable to register
\n
"
);
return
ret
;
...
...
@@ -726,7 +723,7 @@ static int mmp_tdma_probe(struct platform_device *pdev)
if
(
ret
)
{
dev_err
(
tdev
->
device
.
dev
,
"failed to register controller
\n
"
);
dma_async_device_unregister
(
&
tdev
->
device
)
;
return
ret
;
}
}
...
...
drivers/dma/mxs-dma.c
浏览文件 @
b8bb45cb
...
...
@@ -847,7 +847,7 @@ static int __init mxs_dma_probe(struct platform_device *pdev)
mxs_dma
->
dma_device
.
residue_granularity
=
DMA_RESIDUE_GRANULARITY_BURST
;
mxs_dma
->
dma_device
.
device_issue_pending
=
mxs_dma_enable_chan
;
ret
=
dma_async_device_register
(
&
mxs_dma
->
dma_device
);
ret
=
dma
enginem
_async_device_register
(
&
mxs_dma
->
dma_device
);
if
(
ret
)
{
dev_err
(
mxs_dma
->
dma_device
.
dev
,
"unable to register
\n
"
);
return
ret
;
...
...
@@ -857,7 +857,6 @@ static int __init mxs_dma_probe(struct platform_device *pdev)
if
(
ret
)
{
dev_err
(
mxs_dma
->
dma_device
.
dev
,
"failed to register controller
\n
"
);
dma_async_device_unregister
(
&
mxs_dma
->
dma_device
);
}
dev_info
(
mxs_dma
->
dma_device
.
dev
,
"initialized
\n
"
);
...
...
drivers/dma/pxa_dma.c
浏览文件 @
b8bb45cb
...
...
@@ -1285,7 +1285,6 @@ static int pxad_remove(struct platform_device *op)
pxad_cleanup_debugfs
(
pdev
);
pxad_free_channels
(
&
pdev
->
slave
);
dma_async_device_unregister
(
&
pdev
->
slave
);
return
0
;
}
...
...
@@ -1396,7 +1395,7 @@ static int pxad_init_dmadev(struct platform_device *op,
init_waitqueue_head
(
&
c
->
wq_state
);
}
return
dma_async_device_register
(
&
pdev
->
slave
);
return
dma
enginem
_async_device_register
(
&
pdev
->
slave
);
}
static
int
pxad_probe
(
struct
platform_device
*
op
)
...
...
@@ -1433,7 +1432,7 @@ static int pxad_probe(struct platform_device *op)
"#dma-requests set to default 32 as missing in OF: %d"
,
ret
);
nb_requestors
=
32
;
}
;
}
}
else
if
(
pdata
&&
pdata
->
dma_channels
)
{
dma_channels
=
pdata
->
dma_channels
;
nb_requestors
=
pdata
->
nb_requestors
;
...
...
drivers/dma/st_fdma.c
浏览文件 @
b8bb45cb
...
...
@@ -833,7 +833,7 @@ static int st_fdma_probe(struct platform_device *pdev)
fdev
->
dma_device
.
directions
=
BIT
(
DMA_DEV_TO_MEM
)
|
BIT
(
DMA_MEM_TO_DEV
);
fdev
->
dma_device
.
residue_granularity
=
DMA_RESIDUE_GRANULARITY_BURST
;
ret
=
dma_async_device_register
(
&
fdev
->
dma_device
);
ret
=
dma
enginem
_async_device_register
(
&
fdev
->
dma_device
);
if
(
ret
)
{
dev_err
(
&
pdev
->
dev
,
"Failed to register DMA device (%d)
\n
"
,
ret
);
...
...
@@ -844,15 +844,13 @@ static int st_fdma_probe(struct platform_device *pdev)
if
(
ret
)
{
dev_err
(
&
pdev
->
dev
,
"Failed to register controller (%d)
\n
"
,
ret
);
goto
err_
dma_dev
;
goto
err_
rproc
;
}
dev_info
(
&
pdev
->
dev
,
"ST FDMA engine driver, irq:%d
\n
"
,
fdev
->
irq
);
return
0
;
err_dma_dev:
dma_async_device_unregister
(
&
fdev
->
dma_device
);
err_rproc:
st_fdma_free
(
fdev
);
st_slim_rproc_put
(
fdev
->
slim_rproc
);
...
...
@@ -867,7 +865,6 @@ static int st_fdma_remove(struct platform_device *pdev)
devm_free_irq
(
&
pdev
->
dev
,
fdev
->
irq
,
fdev
);
st_slim_rproc_put
(
fdev
->
slim_rproc
);
of_dma_controller_free
(
pdev
->
dev
.
of_node
);
dma_async_device_unregister
(
&
fdev
->
dma_device
);
return
0
;
}
...
...
drivers/dma/ste_dma40.c
浏览文件 @
b8bb45cb
...
...
@@ -2839,7 +2839,7 @@ static int __init d40_dmaengine_init(struct d40_base *base,
d40_ops_init
(
base
,
&
base
->
dma_slave
);
err
=
dma_async_device_register
(
&
base
->
dma_slave
);
err
=
dma
enginem
_async_device_register
(
&
base
->
dma_slave
);
if
(
err
)
{
d40_err
(
base
->
dev
,
"Failed to register slave channels
\n
"
);
...
...
@@ -2854,12 +2854,12 @@ static int __init d40_dmaengine_init(struct d40_base *base,
d40_ops_init
(
base
,
&
base
->
dma_memcpy
);
err
=
dma_async_device_register
(
&
base
->
dma_memcpy
);
err
=
dma
enginem
_async_device_register
(
&
base
->
dma_memcpy
);
if
(
err
)
{
d40_err
(
base
->
dev
,
"Failed to register memcpy only channels
\n
"
);
goto
unregister_slave
;
goto
exit
;
}
d40_chan_init
(
base
,
&
base
->
dma_both
,
base
->
phy_chans
,
...
...
@@ -2871,18 +2871,14 @@ static int __init d40_dmaengine_init(struct d40_base *base,
dma_cap_set
(
DMA_CYCLIC
,
base
->
dma_slave
.
cap_mask
);
d40_ops_init
(
base
,
&
base
->
dma_both
);
err
=
dma_async_device_register
(
&
base
->
dma_both
);
err
=
dma
enginem
_async_device_register
(
&
base
->
dma_both
);
if
(
err
)
{
d40_err
(
base
->
dev
,
"Failed to register logical and physical capable channels
\n
"
);
goto
unregister_memcpy
;
goto
exit
;
}
return
0
;
unregister_memcpy:
dma_async_device_unregister
(
&
base
->
dma_memcpy
);
unregister_slave:
dma_async_device_unregister
(
&
base
->
dma_slave
);
exit:
return
err
;
}
...
...
drivers/dma/stm32-mdma.c
浏览文件 @
b8bb45cb
...
...
@@ -1656,7 +1656,7 @@ static int stm32_mdma_probe(struct platform_device *pdev)
return
ret
;
}
ret
=
dma_async_device_register
(
dd
);
ret
=
dma
enginem
_async_device_register
(
dd
);
if
(
ret
)
return
ret
;
...
...
@@ -1674,8 +1674,6 @@ static int stm32_mdma_probe(struct platform_device *pdev)
return
0
;
err_unregister:
dma_async_device_unregister
(
dd
);
return
ret
;
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录