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
60955521
Commit
60955521
authored
Sep 29, 2016
by
Mark Brown
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'asoc/topic/pcm' into asoc-next
parents
4a2447b4
115c7254
Changes
10
Hide whitespace changes
Inline
Side-by-side
Showing
10 changed files
with
10 additions
and
10 deletions
+10
-10
sound/soc/amd/acp-pcm-dma.c
sound/soc/amd/acp-pcm-dma.c
+1
-1
sound/soc/atmel/atmel-pcm-pdc.c
sound/soc/atmel/atmel-pcm-pdc.c
+1
-1
sound/soc/codecs/rt5514-spi.c
sound/soc/codecs/rt5514-spi.c
+1
-1
sound/soc/fsl/fsl_asrc_dma.c
sound/soc/fsl/fsl_asrc_dma.c
+1
-1
sound/soc/intel/atom/sst-mfld-platform-pcm.c
sound/soc/intel/atom/sst-mfld-platform-pcm.c
+1
-1
sound/soc/intel/haswell/sst-haswell-pcm.c
sound/soc/intel/haswell/sst-haswell-pcm.c
+1
-1
sound/soc/intel/skylake/skl-pcm.c
sound/soc/intel/skylake/skl-pcm.c
+1
-1
sound/soc/kirkwood/kirkwood-dma.c
sound/soc/kirkwood/kirkwood-dma.c
+1
-1
sound/soc/qcom/lpass-platform.c
sound/soc/qcom/lpass-platform.c
+1
-1
sound/soc/soc-utils.c
sound/soc/soc-utils.c
+1
-1
No files found.
sound/soc/amd/acp-pcm-dma.c
View file @
60955521
...
...
@@ -897,7 +897,7 @@ static int acp_dma_close(struct snd_pcm_substream *substream)
return
0
;
}
static
struct
snd_pcm_ops
acp_dma_ops
=
{
static
const
struct
snd_pcm_ops
acp_dma_ops
=
{
.
open
=
acp_dma_open
,
.
close
=
acp_dma_close
,
.
ioctl
=
snd_pcm_lib_ioctl
,
...
...
sound/soc/atmel/atmel-pcm-pdc.c
View file @
60955521
...
...
@@ -381,7 +381,7 @@ static int atmel_pcm_close(struct snd_pcm_substream *substream)
return
0
;
}
static
struct
snd_pcm_ops
atmel_pcm_ops
=
{
static
const
struct
snd_pcm_ops
atmel_pcm_ops
=
{
.
open
=
atmel_pcm_open
,
.
close
=
atmel_pcm_close
,
.
ioctl
=
snd_pcm_lib_ioctl
,
...
...
sound/soc/codecs/rt5514-spi.c
View file @
60955521
...
...
@@ -236,7 +236,7 @@ static snd_pcm_uframes_t rt5514_spi_pcm_pointer(
return
bytes_to_frames
(
runtime
,
rt5514_dsp
->
dma_offset
);
}
static
struct
snd_pcm_ops
rt5514_spi_pcm_ops
=
{
static
const
struct
snd_pcm_ops
rt5514_spi_pcm_ops
=
{
.
open
=
rt5514_spi_pcm_open
,
.
hw_params
=
rt5514_spi_hw_params
,
.
hw_free
=
rt5514_spi_hw_free
,
...
...
sound/soc/fsl/fsl_asrc_dma.c
View file @
60955521
...
...
@@ -322,7 +322,7 @@ static snd_pcm_uframes_t fsl_asrc_dma_pcm_pointer(struct snd_pcm_substream *subs
return
bytes_to_frames
(
substream
->
runtime
,
pair
->
pos
);
}
static
struct
snd_pcm_ops
fsl_asrc_dma_pcm_ops
=
{
static
const
struct
snd_pcm_ops
fsl_asrc_dma_pcm_ops
=
{
.
ioctl
=
snd_pcm_lib_ioctl
,
.
hw_params
=
fsl_asrc_dma_hw_params
,
.
hw_free
=
fsl_asrc_dma_hw_free
,
...
...
sound/soc/intel/atom/sst-mfld-platform-pcm.c
View file @
60955521
...
...
@@ -670,7 +670,7 @@ static snd_pcm_uframes_t sst_platform_pcm_pointer
return
str_info
->
buffer_ptr
;
}
static
struct
snd_pcm_ops
sst_platform_ops
=
{
static
const
struct
snd_pcm_ops
sst_platform_ops
=
{
.
open
=
sst_platform_open
,
.
ioctl
=
snd_pcm_lib_ioctl
,
.
trigger
=
sst_platform_pcm_trigger
,
...
...
sound/soc/intel/haswell/sst-haswell-pcm.c
View file @
60955521
...
...
@@ -871,7 +871,7 @@ static int hsw_pcm_close(struct snd_pcm_substream *substream)
return
ret
;
}
static
struct
snd_pcm_ops
hsw_pcm_ops
=
{
static
const
struct
snd_pcm_ops
hsw_pcm_ops
=
{
.
open
=
hsw_pcm_open
,
.
close
=
hsw_pcm_close
,
.
ioctl
=
snd_pcm_lib_ioctl
,
...
...
sound/soc/intel/skylake/skl-pcm.c
View file @
60955521
...
...
@@ -1094,7 +1094,7 @@ static int skl_get_time_info(struct snd_pcm_substream *substream,
return
0
;
}
static
struct
snd_pcm_ops
skl_platform_ops
=
{
static
const
struct
snd_pcm_ops
skl_platform_ops
=
{
.
open
=
skl_platform_open
,
.
ioctl
=
snd_pcm_lib_ioctl
,
.
trigger
=
skl_platform_pcm_trigger
,
...
...
sound/soc/kirkwood/kirkwood-dma.c
View file @
60955521
...
...
@@ -242,7 +242,7 @@ static snd_pcm_uframes_t kirkwood_dma_pointer(struct snd_pcm_substream
return
count
;
}
static
struct
snd_pcm_ops
kirkwood_dma_ops
=
{
static
const
struct
snd_pcm_ops
kirkwood_dma_ops
=
{
.
open
=
kirkwood_dma_open
,
.
close
=
kirkwood_dma_close
,
.
ioctl
=
snd_pcm_lib_ioctl
,
...
...
sound/soc/qcom/lpass-platform.c
View file @
60955521
...
...
@@ -372,7 +372,7 @@ static int lpass_platform_pcmops_mmap(struct snd_pcm_substream *substream,
runtime
->
dma_bytes
);
}
static
struct
snd_pcm_ops
lpass_platform_pcm_ops
=
{
static
const
struct
snd_pcm_ops
lpass_platform_pcm_ops
=
{
.
open
=
lpass_platform_pcmops_open
,
.
ioctl
=
snd_pcm_lib_ioctl
,
.
hw_params
=
lpass_platform_pcmops_hw_params
,
...
...
sound/soc/soc-utils.c
View file @
60955521
...
...
@@ -80,7 +80,7 @@ static int dummy_dma_open(struct snd_pcm_substream *substream)
return
0
;
}
static
struct
snd_pcm_ops
dummy_dma_ops
=
{
static
const
struct
snd_pcm_ops
dummy_dma_ops
=
{
.
open
=
dummy_dma_open
,
.
ioctl
=
snd_pcm_lib_ioctl
,
};
...
...
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