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
Kirill Smelkov
linux
Commits
fdce39bd
Commit
fdce39bd
authored
Apr 12, 2013
by
Mark Brown
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'asoc/fix/tegra' into asoc-next
parents
e162520d
5aa995e8
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
1 addition
and
23 deletions
+1
-23
sound/soc/tegra/tegra_pcm.c
sound/soc/tegra/tegra_pcm.c
+1
-23
No files found.
sound/soc/tegra/tegra_pcm.c
View file @
fdce39bd
...
@@ -43,8 +43,6 @@
...
@@ -43,8 +43,6 @@
static
const
struct
snd_pcm_hardware
tegra_pcm_hardware
=
{
static
const
struct
snd_pcm_hardware
tegra_pcm_hardware
=
{
.
info
=
SNDRV_PCM_INFO_MMAP
|
.
info
=
SNDRV_PCM_INFO_MMAP
|
SNDRV_PCM_INFO_MMAP_VALID
|
SNDRV_PCM_INFO_MMAP_VALID
|
SNDRV_PCM_INFO_PAUSE
|
SNDRV_PCM_INFO_RESUME
|
SNDRV_PCM_INFO_INTERLEAVED
,
SNDRV_PCM_INFO_INTERLEAVED
,
.
formats
=
SNDRV_PCM_FMTBIT_S16_LE
,
.
formats
=
SNDRV_PCM_FMTBIT_S16_LE
,
.
channels_min
=
2
,
.
channels_min
=
2
,
...
@@ -127,26 +125,6 @@ static int tegra_pcm_hw_free(struct snd_pcm_substream *substream)
...
@@ -127,26 +125,6 @@ static int tegra_pcm_hw_free(struct snd_pcm_substream *substream)
return
0
;
return
0
;
}
}
static
int
tegra_pcm_trigger
(
struct
snd_pcm_substream
*
substream
,
int
cmd
)
{
switch
(
cmd
)
{
case
SNDRV_PCM_TRIGGER_START
:
case
SNDRV_PCM_TRIGGER_RESUME
:
case
SNDRV_PCM_TRIGGER_PAUSE_RELEASE
:
return
snd_dmaengine_pcm_trigger
(
substream
,
SNDRV_PCM_TRIGGER_START
);
case
SNDRV_PCM_TRIGGER_STOP
:
case
SNDRV_PCM_TRIGGER_SUSPEND
:
case
SNDRV_PCM_TRIGGER_PAUSE_PUSH
:
return
snd_dmaengine_pcm_trigger
(
substream
,
SNDRV_PCM_TRIGGER_STOP
);
default:
return
-
EINVAL
;
}
return
0
;
}
static
int
tegra_pcm_mmap
(
struct
snd_pcm_substream
*
substream
,
static
int
tegra_pcm_mmap
(
struct
snd_pcm_substream
*
substream
,
struct
vm_area_struct
*
vma
)
struct
vm_area_struct
*
vma
)
{
{
...
@@ -164,7 +142,7 @@ static struct snd_pcm_ops tegra_pcm_ops = {
...
@@ -164,7 +142,7 @@ static struct snd_pcm_ops tegra_pcm_ops = {
.
ioctl
=
snd_pcm_lib_ioctl
,
.
ioctl
=
snd_pcm_lib_ioctl
,
.
hw_params
=
tegra_pcm_hw_params
,
.
hw_params
=
tegra_pcm_hw_params
,
.
hw_free
=
tegra_pcm_hw_free
,
.
hw_free
=
tegra_pcm_hw_free
,
.
trigger
=
tegra
_pcm_trigger
,
.
trigger
=
snd_dmaengine
_pcm_trigger
,
.
pointer
=
snd_dmaengine_pcm_pointer
,
.
pointer
=
snd_dmaengine_pcm_pointer
,
.
mmap
=
tegra_pcm_mmap
,
.
mmap
=
tegra_pcm_mmap
,
};
};
...
...
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