Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
L
linux
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
linux
Commits
5ddab696
Commit
5ddab696
authored
Nov 14, 2017
by
Vinod Koul
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'topic/print_fixes' into for-linus
parents
f855e384
77ea824c
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
4 deletions
+4
-4
drivers/dma/at_hdmac_regs.h
drivers/dma/at_hdmac_regs.h
+1
-1
drivers/dma/coh901318.c
drivers/dma/coh901318.c
+3
-3
No files found.
drivers/dma/at_hdmac_regs.h
View file @
5ddab696
...
...
@@ -385,7 +385,7 @@ static void vdbg_dump_regs(struct at_dma_chan *atchan) {}
static
void
atc_dump_lli
(
struct
at_dma_chan
*
atchan
,
struct
at_lli
*
lli
)
{
dev_crit
(
chan2dev
(
&
atchan
->
chan_common
),
"
desc: s%pad d%pad ctrl0x%x:0x%x l0x
%pad
\n
"
,
"
desc: s%pad d%pad ctrl0x%x:0x%x l
%pad
\n
"
,
&
lli
->
saddr
,
&
lli
->
daddr
,
lli
->
ctrla
,
lli
->
ctrlb
,
&
lli
->
dscr
);
}
...
...
drivers/dma/coh901318.c
View file @
5ddab696
...
...
@@ -1319,8 +1319,8 @@ static void coh901318_list_print(struct coh901318_chan *cohc,
int
i
=
0
;
while
(
l
)
{
dev_vdbg
(
COHC_2_DEV
(
cohc
),
"i %d, lli %p, ctrl 0x%x, src
0x
%pad"
", dst
0x%pad, link 0x
%pad virt_link_addr 0x%p
\n
"
,
dev_vdbg
(
COHC_2_DEV
(
cohc
),
"i %d, lli %p, ctrl 0x%x, src %pad"
", dst
%pad, link
%pad virt_link_addr 0x%p
\n
"
,
i
,
l
,
l
->
control
,
&
l
->
src_addr
,
&
l
->
dst_addr
,
&
l
->
link_addr
,
l
->
virt_link_addr
);
i
++
;
...
...
@@ -2231,7 +2231,7 @@ coh901318_prep_memcpy(struct dma_chan *chan, dma_addr_t dest, dma_addr_t src,
spin_lock_irqsave
(
&
cohc
->
lock
,
flg
);
dev_vdbg
(
COHC_2_DEV
(
cohc
),
"[%s] channel %d src
0x%pad dest 0x
%pad size %zu
\n
"
,
"[%s] channel %d src
%pad dest
%pad size %zu
\n
"
,
__func__
,
cohc
->
id
,
&
src
,
&
dest
,
size
);
if
(
flags
&
DMA_PREP_INTERRUPT
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment