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
3967752a
Commit
3967752a
authored
Feb 04, 2015
by
Mark Brown
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'asoc/topic/dmaengine' into asoc-next
parents
b47f8a5d
de7621e8
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
13 deletions
+2
-13
sound/soc/soc-generic-dmaengine-pcm.c
sound/soc/soc-generic-dmaengine-pcm.c
+2
-13
No files found.
sound/soc/soc-generic-dmaengine-pcm.c
View file @
3967752a
...
@@ -200,11 +200,6 @@ static int dmaengine_pcm_open(struct snd_pcm_substream *substream)
...
@@ -200,11 +200,6 @@ static int dmaengine_pcm_open(struct snd_pcm_substream *substream)
return
snd_dmaengine_pcm_open
(
substream
,
chan
);
return
snd_dmaengine_pcm_open
(
substream
,
chan
);
}
}
static
void
dmaengine_pcm_free
(
struct
snd_pcm
*
pcm
)
{
snd_pcm_lib_preallocate_free_for_all
(
pcm
);
}
static
struct
dma_chan
*
dmaengine_pcm_compat_request_channel
(
static
struct
dma_chan
*
dmaengine_pcm_compat_request_channel
(
struct
snd_soc_pcm_runtime
*
rtd
,
struct
snd_soc_pcm_runtime
*
rtd
,
struct
snd_pcm_substream
*
substream
)
struct
snd_pcm_substream
*
substream
)
...
@@ -283,8 +278,7 @@ static int dmaengine_pcm_new(struct snd_soc_pcm_runtime *rtd)
...
@@ -283,8 +278,7 @@ static int dmaengine_pcm_new(struct snd_soc_pcm_runtime *rtd)
if
(
!
pcm
->
chan
[
i
])
{
if
(
!
pcm
->
chan
[
i
])
{
dev_err
(
rtd
->
platform
->
dev
,
dev_err
(
rtd
->
platform
->
dev
,
"Missing dma channel for stream: %d
\n
"
,
i
);
"Missing dma channel for stream: %d
\n
"
,
i
);
ret
=
-
EINVAL
;
return
-
EINVAL
;
goto
err_free
;
}
}
ret
=
snd_pcm_lib_preallocate_pages
(
substream
,
ret
=
snd_pcm_lib_preallocate_pages
(
substream
,
...
@@ -293,7 +287,7 @@ static int dmaengine_pcm_new(struct snd_soc_pcm_runtime *rtd)
...
@@ -293,7 +287,7 @@ static int dmaengine_pcm_new(struct snd_soc_pcm_runtime *rtd)
prealloc_buffer_size
,
prealloc_buffer_size
,
max_buffer_size
);
max_buffer_size
);
if
(
ret
)
if
(
ret
)
goto
err_free
;
return
ret
;
/*
/*
* This will only return false if we know for sure that at least
* This will only return false if we know for sure that at least
...
@@ -307,10 +301,6 @@ static int dmaengine_pcm_new(struct snd_soc_pcm_runtime *rtd)
...
@@ -307,10 +301,6 @@ static int dmaengine_pcm_new(struct snd_soc_pcm_runtime *rtd)
}
}
return
0
;
return
0
;
err_free:
dmaengine_pcm_free
(
rtd
->
pcm
);
return
ret
;
}
}
static
snd_pcm_uframes_t
dmaengine_pcm_pointer
(
static
snd_pcm_uframes_t
dmaengine_pcm_pointer
(
...
@@ -341,7 +331,6 @@ static const struct snd_soc_platform_driver dmaengine_pcm_platform = {
...
@@ -341,7 +331,6 @@ static const struct snd_soc_platform_driver dmaengine_pcm_platform = {
},
},
.
ops
=
&
dmaengine_pcm_ops
,
.
ops
=
&
dmaengine_pcm_ops
,
.
pcm_new
=
dmaengine_pcm_new
,
.
pcm_new
=
dmaengine_pcm_new
,
.
pcm_free
=
dmaengine_pcm_free
,
};
};
static
const
char
*
const
dmaengine_pcm_dma_channel_names
[]
=
{
static
const
char
*
const
dmaengine_pcm_dma_channel_names
[]
=
{
...
...
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