aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2011-05-02 06:17:41 -0400
committerTakashi Iwai <tiwai@suse.de>2011-05-02 06:20:31 -0400
commitfb79e1e0a2eef3859f9bcc0df67fa3f1352735d3 (patch)
tree5fa18b0587e7916c366995493da60a149ea5b117
parent34cbe3a6faa8715c4f9e07484248aa32c1c7577e (diff)
ALSA: hda - Constify fixup and other array data in patch_hdmi.c
Signed-off-by: Takashi Iwai <tiwai@suse.de>
-rw-r--r--sound/pci/hda/patch_hdmi.c26
1 files changed, 13 insertions, 13 deletions
diff --git a/sound/pci/hda/patch_hdmi.c b/sound/pci/hda/patch_hdmi.c
index 715615a88a8d..6eb209d4b5b9 100644
--- a/sound/pci/hda/patch_hdmi.c
+++ b/sound/pci/hda/patch_hdmi.c
@@ -76,7 +76,7 @@ struct hdmi_spec {
76 * ati/nvhdmi specific 76 * ati/nvhdmi specific
77 */ 77 */
78 struct hda_multi_out multiout; 78 struct hda_multi_out multiout;
79 struct hda_pcm_stream *pcm_playback; 79 const struct hda_pcm_stream *pcm_playback;
80 80
81 /* misc flags */ 81 /* misc flags */
82 /* PD bit indicates only the update, not the current state */ 82 /* PD bit indicates only the update, not the current state */
@@ -1044,7 +1044,7 @@ static int generic_hdmi_playback_pcm_prepare(struct hda_pcm_stream *hinfo,
1044 return hdmi_setup_stream(codec, hinfo->nid, stream_tag, format); 1044 return hdmi_setup_stream(codec, hinfo->nid, stream_tag, format);
1045} 1045}
1046 1046
1047static struct hda_pcm_stream generic_hdmi_pcm_playback = { 1047static const struct hda_pcm_stream generic_hdmi_pcm_playback = {
1048 .substreams = 1, 1048 .substreams = 1,
1049 .channels_min = 2, 1049 .channels_min = 2,
1050 .ops = { 1050 .ops = {
@@ -1124,7 +1124,7 @@ static void generic_hdmi_free(struct hda_codec *codec)
1124 kfree(spec); 1124 kfree(spec);
1125} 1125}
1126 1126
1127static struct hda_codec_ops generic_hdmi_patch_ops = { 1127static const struct hda_codec_ops generic_hdmi_patch_ops = {
1128 .init = generic_hdmi_init, 1128 .init = generic_hdmi_init,
1129 .free = generic_hdmi_free, 1129 .free = generic_hdmi_free,
1130 .build_pcms = generic_hdmi_build_pcms, 1130 .build_pcms = generic_hdmi_build_pcms,
@@ -1169,12 +1169,12 @@ static int patch_generic_hdmi(struct hda_codec *codec)
1169#define nvhdmi_master_con_nid_7x 0x04 1169#define nvhdmi_master_con_nid_7x 0x04
1170#define nvhdmi_master_pin_nid_7x 0x05 1170#define nvhdmi_master_pin_nid_7x 0x05
1171 1171
1172static hda_nid_t nvhdmi_con_nids_7x[4] = { 1172static const hda_nid_t nvhdmi_con_nids_7x[4] = {
1173 /*front, rear, clfe, rear_surr */ 1173 /*front, rear, clfe, rear_surr */
1174 0x6, 0x8, 0xa, 0xc, 1174 0x6, 0x8, 0xa, 0xc,
1175}; 1175};
1176 1176
1177static struct hda_verb nvhdmi_basic_init_7x[] = { 1177static const struct hda_verb nvhdmi_basic_init_7x[] = {
1178 /* set audio protect on */ 1178 /* set audio protect on */
1179 { 0x1, Nv_VERB_SET_Audio_Protection_On, 0x1}, 1179 { 0x1, Nv_VERB_SET_Audio_Protection_On, 0x1},
1180 /* enable digital output on pin widget */ 1180 /* enable digital output on pin widget */
@@ -1435,7 +1435,7 @@ static int nvhdmi_8ch_7x_pcm_prepare(struct hda_pcm_stream *hinfo,
1435 return 0; 1435 return 0;
1436} 1436}
1437 1437
1438static struct hda_pcm_stream nvhdmi_pcm_playback_8ch_7x = { 1438static const struct hda_pcm_stream nvhdmi_pcm_playback_8ch_7x = {
1439 .substreams = 1, 1439 .substreams = 1,
1440 .channels_min = 2, 1440 .channels_min = 2,
1441 .channels_max = 8, 1441 .channels_max = 8,
@@ -1450,7 +1450,7 @@ static struct hda_pcm_stream nvhdmi_pcm_playback_8ch_7x = {
1450 }, 1450 },
1451}; 1451};
1452 1452
1453static struct hda_pcm_stream nvhdmi_pcm_playback_2ch = { 1453static const struct hda_pcm_stream nvhdmi_pcm_playback_2ch = {
1454 .substreams = 1, 1454 .substreams = 1,
1455 .channels_min = 2, 1455 .channels_min = 2,
1456 .channels_max = 2, 1456 .channels_max = 2,
@@ -1465,14 +1465,14 @@ static struct hda_pcm_stream nvhdmi_pcm_playback_2ch = {
1465 }, 1465 },
1466}; 1466};
1467 1467
1468static struct hda_codec_ops nvhdmi_patch_ops_8ch_7x = { 1468static const struct hda_codec_ops nvhdmi_patch_ops_8ch_7x = {
1469 .build_controls = generic_hdmi_build_controls, 1469 .build_controls = generic_hdmi_build_controls,
1470 .build_pcms = generic_hdmi_build_pcms, 1470 .build_pcms = generic_hdmi_build_pcms,
1471 .init = nvhdmi_7x_init, 1471 .init = nvhdmi_7x_init,
1472 .free = generic_hdmi_free, 1472 .free = generic_hdmi_free,
1473}; 1473};
1474 1474
1475static struct hda_codec_ops nvhdmi_patch_ops_2ch = { 1475static const struct hda_codec_ops nvhdmi_patch_ops_2ch = {
1476 .build_controls = generic_hdmi_build_controls, 1476 .build_controls = generic_hdmi_build_controls,
1477 .build_pcms = generic_hdmi_build_pcms, 1477 .build_pcms = generic_hdmi_build_pcms,
1478 .init = nvhdmi_7x_init, 1478 .init = nvhdmi_7x_init,
@@ -1568,7 +1568,7 @@ static int atihdmi_playback_pcm_prepare(struct hda_pcm_stream *hinfo,
1568 return 0; 1568 return 0;
1569} 1569}
1570 1570
1571static struct hda_pcm_stream atihdmi_pcm_digital_playback = { 1571static const struct hda_pcm_stream atihdmi_pcm_digital_playback = {
1572 .substreams = 1, 1572 .substreams = 1,
1573 .channels_min = 2, 1573 .channels_min = 2,
1574 .channels_max = 2, 1574 .channels_max = 2,
@@ -1580,7 +1580,7 @@ static struct hda_pcm_stream atihdmi_pcm_digital_playback = {
1580 }, 1580 },
1581}; 1581};
1582 1582
1583static struct hda_verb atihdmi_basic_init[] = { 1583static const struct hda_verb atihdmi_basic_init[] = {
1584 /* enable digital output on pin widget */ 1584 /* enable digital output on pin widget */
1585 { 0x03, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT }, 1585 { 0x03, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT },
1586 {} /* terminator */ 1586 {} /* terminator */
@@ -1599,7 +1599,7 @@ static int atihdmi_init(struct hda_codec *codec)
1599 return 0; 1599 return 0;
1600} 1600}
1601 1601
1602static struct hda_codec_ops atihdmi_patch_ops = { 1602static const struct hda_codec_ops atihdmi_patch_ops = {
1603 .build_controls = generic_hdmi_build_controls, 1603 .build_controls = generic_hdmi_build_controls,
1604 .build_pcms = generic_hdmi_build_pcms, 1604 .build_pcms = generic_hdmi_build_pcms,
1605 .init = atihdmi_init, 1605 .init = atihdmi_init,
@@ -1634,7 +1634,7 @@ static int patch_atihdmi(struct hda_codec *codec)
1634/* 1634/*
1635 * patch entries 1635 * patch entries
1636 */ 1636 */
1637static struct hda_codec_preset snd_hda_preset_hdmi[] = { 1637static const struct hda_codec_preset snd_hda_preset_hdmi[] = {
1638{ .id = 0x1002793c, .name = "RS600 HDMI", .patch = patch_atihdmi }, 1638{ .id = 0x1002793c, .name = "RS600 HDMI", .patch = patch_atihdmi },
1639{ .id = 0x10027919, .name = "RS600 HDMI", .patch = patch_atihdmi }, 1639{ .id = 0x10027919, .name = "RS600 HDMI", .patch = patch_atihdmi },
1640{ .id = 0x1002791a, .name = "RS690/780 HDMI", .patch = patch_atihdmi }, 1640{ .id = 0x1002791a, .name = "RS690/780 HDMI", .patch = patch_atihdmi },