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
9cf0aa9e
Commit
9cf0aa9e
authored
May 02, 2011
by
Takashi Iwai
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
ALSA: hda - Constify fixup and other array data in patch_si3054.c
Signed-off-by:
Takashi Iwai
<
tiwai@suse.de
>
parent
fb79e1e0
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
6 additions
and
5 deletions
+6
-5
sound/pci/hda/patch_si3054.c
sound/pci/hda/patch_si3054.c
+6
-5
No files found.
sound/pci/hda/patch_si3054.c
View file @
9cf0aa9e
...
@@ -130,7 +130,7 @@ static int si3054_switch_put(struct snd_kcontrol *kcontrol,
...
@@ -130,7 +130,7 @@ static int si3054_switch_put(struct snd_kcontrol *kcontrol,
}
}
static
struct
snd_kcontrol_new
si3054_modem_mixer
[]
=
{
static
const
struct
snd_kcontrol_new
si3054_modem_mixer
[]
=
{
SI3054_KCONTROL
(
"Off-hook Switch"
,
SI3054_GPIO_CONTROL
,
SI3054_GPIO_OH
),
SI3054_KCONTROL
(
"Off-hook Switch"
,
SI3054_GPIO_CONTROL
,
SI3054_GPIO_OH
),
SI3054_KCONTROL
(
"Caller ID Switch"
,
SI3054_GPIO_CONTROL
,
SI3054_GPIO_CID
),
SI3054_KCONTROL
(
"Caller ID Switch"
,
SI3054_GPIO_CONTROL
,
SI3054_GPIO_CID
),
{}
{}
...
@@ -181,7 +181,7 @@ static int si3054_pcm_open(struct hda_pcm_stream *hinfo,
...
@@ -181,7 +181,7 @@ static int si3054_pcm_open(struct hda_pcm_stream *hinfo,
}
}
static
struct
hda_pcm_stream
si3054_pcm
=
{
static
const
struct
hda_pcm_stream
si3054_pcm
=
{
.
substreams
=
1
,
.
substreams
=
1
,
.
channels_min
=
1
,
.
channels_min
=
1
,
.
channels_max
=
1
,
.
channels_max
=
1
,
...
@@ -200,12 +200,13 @@ static int si3054_build_pcms(struct hda_codec *codec)
...
@@ -200,12 +200,13 @@ static int si3054_build_pcms(struct hda_codec *codec)
{
{
struct
si3054_spec
*
spec
=
codec
->
spec
;
struct
si3054_spec
*
spec
=
codec
->
spec
;
struct
hda_pcm
*
info
=
&
spec
->
pcm
;
struct
hda_pcm
*
info
=
&
spec
->
pcm
;
si3054_pcm
.
nid
=
codec
->
mfg
;
codec
->
num_pcms
=
1
;
codec
->
num_pcms
=
1
;
codec
->
pcm_info
=
info
;
codec
->
pcm_info
=
info
;
info
->
name
=
"Si3054 Modem"
;
info
->
name
=
"Si3054 Modem"
;
info
->
stream
[
SNDRV_PCM_STREAM_PLAYBACK
]
=
si3054_pcm
;
info
->
stream
[
SNDRV_PCM_STREAM_PLAYBACK
]
=
si3054_pcm
;
info
->
stream
[
SNDRV_PCM_STREAM_CAPTURE
]
=
si3054_pcm
;
info
->
stream
[
SNDRV_PCM_STREAM_CAPTURE
]
=
si3054_pcm
;
info
->
stream
[
SNDRV_PCM_STREAM_PLAYBACK
].
nid
=
codec
->
mfg
;
info
->
stream
[
SNDRV_PCM_STREAM_CAPTURE
].
nid
=
codec
->
mfg
;
info
->
pcm_type
=
HDA_PCM_TYPE_MODEM
;
info
->
pcm_type
=
HDA_PCM_TYPE_MODEM
;
return
0
;
return
0
;
}
}
...
@@ -263,7 +264,7 @@ static void si3054_free(struct hda_codec *codec)
...
@@ -263,7 +264,7 @@ static void si3054_free(struct hda_codec *codec)
/*
/*
*/
*/
static
struct
hda_codec_ops
si3054_patch_ops
=
{
static
const
struct
hda_codec_ops
si3054_patch_ops
=
{
.
build_controls
=
si3054_build_controls
,
.
build_controls
=
si3054_build_controls
,
.
build_pcms
=
si3054_build_pcms
,
.
build_pcms
=
si3054_build_pcms
,
.
init
=
si3054_init
,
.
init
=
si3054_init
,
...
@@ -283,7 +284,7 @@ static int patch_si3054(struct hda_codec *codec)
...
@@ -283,7 +284,7 @@ static int patch_si3054(struct hda_codec *codec)
/*
/*
* patch entries
* patch entries
*/
*/
static
struct
hda_codec_preset
snd_hda_preset_si3054
[]
=
{
static
const
struct
hda_codec_preset
snd_hda_preset_si3054
[]
=
{
{
.
id
=
0x163c3055
,
.
name
=
"Si3054"
,
.
patch
=
patch_si3054
},
{
.
id
=
0x163c3055
,
.
name
=
"Si3054"
,
.
patch
=
patch_si3054
},
{
.
id
=
0x163c3155
,
.
name
=
"Si3054"
,
.
patch
=
patch_si3054
},
{
.
id
=
0x163c3155
,
.
name
=
"Si3054"
,
.
patch
=
patch_si3054
},
{
.
id
=
0x11c13026
,
.
name
=
"Si3054"
,
.
patch
=
patch_si3054
},
{
.
id
=
0x11c13026
,
.
name
=
"Si3054"
,
.
patch
=
patch_si3054
},
...
...
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