ALSA: hda - constify and cleanup static NodeID tables
PATCH v2 1/1 ALSA: hda - constify and cleanup static NodeID tables
Make hda_nid_t tables static const, as they are not intended to be modified by callees.
Signed-off-by Michał Mirosław <[email protected]>
---
v2:
move signoff from cut-out area
v1:
patch against tiwai/sound/topic/constification branch
--- sound/pci/hda/hda_generic.c | 4 +-- sound/pci/hda/patch_analog.c | 6 ++-- sound/pci/hda/patch_ca0132.c | 12 +++---- sound/pci/hda/patch_conexant.c | 6 ++-- sound/pci/hda/patch_realtek.c | 62 +++++++++++++++++----------------- sound/pci/hda/patch_sigmatel.c | 4 +-- sound/pci/hda/patch_via.c | 4 +-- 7 files changed, 49 insertions(+), 49 deletions(-)
sound/pci/hda/hda_generic.c +2 -2
@@ -4401,7 +4401,7 @@ EXPORT_SYMBOL_GPL(snd_hda_gen_fix_pin_power);*/ /* check each pin in the given array; returns true if any of them is plugged */ -static bool detect_jacks (struct hda_codec *codec,int num_pins,hda_nid_t *pins) +static bool detect_jacks (struct hda_codec *codec,int num_pins,const hda_nid_t *pins) {int i;bool present = false;
@@ -4420,7 +4420,7 @@ static bool detect_jacks(struct hda_codec *codec, int num_pins, hda_nid_t *pins) }/* standard HP/line-out auto-mute helper */ -static void do_automute (struct hda_codec *codec,int num_pins,hda_nid_t *pins, +static void do_automute (struct hda_codec *codec,int num_pins,const hda_nid_t *pins,int *paths,bool mute) {struct hda_gen_spec *spec = codec->spec;
sound/pci/hda/patch_analog.c +3 -3
@@ -389,7 +389,7 @@ static int patch_ad1986a(struct hda_codec *codec) {int err;struct ad198x_spec *spec; -static hda_nid_t preferred_pairs[] = { +static const hda_nid_t preferred_pairs[] = {0x1a ,0x03 ,0x1b ,0x03 ,0x1c ,0x04 ,
@@ -519,9 +519,9 @@ static int ad1983_add_spdif_mux_ctl(struct hda_codec *codec)static int patch_ad1983 (struct hda_codec *codec) { +static const hda_nid_t conn_0c[] = {0x08 }; +static const hda_nid_t conn_0d[] = {0x09 };struct ad198x_spec *spec; -static hda_nid_t conn_0c[] = {0x08 }; -static hda_nid_t conn_0d[] = {0x09 };int err; err =alloc_ad_spec (codec);
sound/pci/hda/patch_ca0132.c +6 -6
@@ -7802,23 +7802,23 @@ static void sbz_region2_exit(struct hda_codec *codec)static void sbz_set_pin_ctl_default (struct hda_codec *codec) { -hda_nid_t pins[5 ] = {0x0B ,0x0C ,0x0E ,0x12 ,0x13 }; +static const hda_nid_t pins[] = {0x0B ,0x0C ,0x0E ,0x12 ,0x13 };unsigned int i;snd_hda_codec_write (codec,0x11 ,0 ,AC_VERB_SET_PIN_WIDGET_CONTROL ,0x40 ); -for (i =0 ; i <5 ; i++) +for (i =0 ; i <ARRAY_SIZE (pins); i++)snd_hda_codec_write (codec, pins[i],0 ,AC_VERB_SET_PIN_WIDGET_CONTROL ,0x00 ); }static void ca0132_clear_unsolicited (struct hda_codec *codec) { -hda_nid_t pins[7 ] = {0x0B ,0x0E ,0x0F ,0x10 ,0x11 ,0x12 ,0x13 }; +static const hda_nid_t pins[] = {0x0B ,0x0E ,0x0F ,0x10 ,0x11 ,0x12 ,0x13 };unsigned int i; -for (i =0 ; i <7 ; i++) { +for (i =0 ; i <ARRAY_SIZE (pins); i++) {snd_hda_codec_write (codec, pins[i],0 ,AC_VERB_SET_UNSOLICITED_ENABLE ,0x00 ); }
@@ -7842,10 +7842,10 @@ static void sbz_gpio_shutdown_commands(struct hda_codec *codec, int dir,static void zxr_dbpro_power_state_shutdown (struct hda_codec *codec) { -hda_nid_t pins[7 ] = {0x05 ,0x0c ,0x09 ,0x0e ,0x08 ,0x11 ,0x01 }; +static const hda_nid_t pins[] = {0x05 ,0x0c ,0x09 ,0x0e ,0x08 ,0x11 ,0x01 };unsigned int i; -for (i =0 ; i <7 ; i++) +for (i =0 ; i <ARRAY_SIZE (pins); i++)snd_hda_codec_write (codec, pins[i],0 ,AC_VERB_SET_POWER_STATE ,0x03 ); }
sound/pci/hda/patch_conexant.c +3 -3
@@ -116,7 +116,7 @@ static void cx_auto_parse_eapd(struct hda_codec *codec) }static void cx_auto_turn_eapd (struct hda_codec *codec,int num_pins, -hda_nid_t *pins,bool on) +const hda_nid_t *pins,bool on) {int i;for (i =0 ; i < num_pins; i++) {
@@ -959,10 +959,10 @@ static const struct hda_model_fixup cxt5066_fixup_models[] = {static void add_cx5051_fake_mutes (struct hda_codec *codec) {struct conexant_spec *spec = codec->spec; -static hda_nid_t out_nids[] = { +static const hda_nid_t out_nids[] = {0x10 ,0x11 ,0 }; -hda_nid_t *p; +const hda_nid_t *p;for (p = out_nids; *p; p++) snd_hda_override_amp_caps(codec, *p, HDA_OUTPUT,
sound/pci/hda/patch_realtek.c +31 -31
151 lines not on this page · raw message
sound/pci/hda/patch_sigmatel.c +2 -2
@@ -795,7 +795,7 @@ static int find_mute_led_cfg(struct hda_codec *codec, int default_polarity)static bool has_builtin_speaker (struct hda_codec *codec) {struct sigmatel_spec *spec = codec->spec; -hda_nid_t *nid_pin; +const hda_nid_t *nid_pin;int nids, i;if (spec->gen.autocfg.line_out_type ==AUTO_PIN_SPEAKER_OUT ) {
@@ -2182,7 +2182,7 @@ static void hp_envy_ts_fixup_dac_bind(struct hda_codec *codec, int action) {struct sigmatel_spec *spec = codec->spec; -static hda_nid_t preferred_pairs[] = { +static const hda_nid_t preferred_pairs[] = {0xd ,0x13 ,0 };
sound/pci/hda/patch_via.c +2 -2
@@ -1038,8 +1038,8 @@ static const struct snd_pci_quirk vt2002p_fixups[] = {*/ static void fix_vt1802_connections (struct hda_codec *codec) { -static hda_nid_t conn_24[] = {0x14 ,0x1c }; -static hda_nid_t conn_33[] = {0x1c }; +static const hda_nid_t conn_24[] = {0x14 ,0x1c }; +static const hda_nid_t conn_33[] = {0x1c };snd_hda_override_conn_list (codec,0x24 ,ARRAY_SIZE (conn_24), conn_24);snd_hda_override_conn_list (codec,0x33 ,ARRAY_SIZE (conn_33), conn_33);
Signature · 1 line
2.20.1