| Message ID | 1419165312-28886-1-git-send-email-rickard_strandqvist@spectrumdigital.se (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 57da6bdd4823ad70ac58c5cd968943a4be95d739 |
| Headers | show |
At Sun, 21 Dec 2014 13:35:12 +0100, Rickard Strandqvist wrote: > > Removes some functions that are not used anywhere: > ad198x_ch_mode_get() ad198x_ch_mode_info() ad198x_ch_mode_info() > > This was partially found by using a static code analysis program called cppcheck. > > Signed-off-by: Rickard Strandqvist <rickard_strandqvist@spectrumdigital.se> OK, you sent it already... Applied now. thanks, Takashi > --- > sound/pci/hda/patch_analog.c | 33 --------------------------------- > 1 file changed, 33 deletions(-) > > diff --git a/sound/pci/hda/patch_analog.c b/sound/pci/hda/patch_analog.c > index 06275f8..0e76dcc 100644 > --- a/sound/pci/hda/patch_analog.c > +++ b/sound/pci/hda/patch_analog.c > @@ -697,39 +697,6 @@ static int patch_ad1981(struct hda_codec *codec) > * E/F quad mic array > */ > > -#ifdef ENABLE_AD_STATIC_QUIRKS > -static int ad198x_ch_mode_info(struct snd_kcontrol *kcontrol, > - struct snd_ctl_elem_info *uinfo) > -{ > - struct hda_codec *codec = snd_kcontrol_chip(kcontrol); > - struct ad198x_spec *spec = codec->spec; > - return snd_hda_ch_mode_info(codec, uinfo, spec->channel_mode, > - spec->num_channel_mode); > -} > - > -static int ad198x_ch_mode_get(struct snd_kcontrol *kcontrol, > - struct snd_ctl_elem_value *ucontrol) > -{ > - struct hda_codec *codec = snd_kcontrol_chip(kcontrol); > - struct ad198x_spec *spec = codec->spec; > - return snd_hda_ch_mode_get(codec, ucontrol, spec->channel_mode, > - spec->num_channel_mode, spec->multiout.max_channels); > -} > - > -static int ad198x_ch_mode_put(struct snd_kcontrol *kcontrol, > - struct snd_ctl_elem_value *ucontrol) > -{ > - struct hda_codec *codec = snd_kcontrol_chip(kcontrol); > - struct ad198x_spec *spec = codec->spec; > - int err = snd_hda_ch_mode_put(codec, ucontrol, spec->channel_mode, > - spec->num_channel_mode, > - &spec->multiout.max_channels); > - if (err >= 0 && spec->need_dac_fix) > - spec->multiout.num_dacs = spec->multiout.max_channels / 2; > - return err; > -} > -#endif /* ENABLE_AD_STATIC_QUIRKS */ > - > static int ad1988_auto_smux_enum_info(struct snd_kcontrol *kcontrol, > struct snd_ctl_elem_info *uinfo) > { > -- > 1.7.10.4 >
diff --git a/sound/pci/hda/patch_analog.c b/sound/pci/hda/patch_analog.c index 06275f8..0e76dcc 100644 --- a/sound/pci/hda/patch_analog.c +++ b/sound/pci/hda/patch_analog.c @@ -697,39 +697,6 @@ static int patch_ad1981(struct hda_codec *codec) * E/F quad mic array */ -#ifdef ENABLE_AD_STATIC_QUIRKS -static int ad198x_ch_mode_info(struct snd_kcontrol *kcontrol, - struct snd_ctl_elem_info *uinfo) -{ - struct hda_codec *codec = snd_kcontrol_chip(kcontrol); - struct ad198x_spec *spec = codec->spec; - return snd_hda_ch_mode_info(codec, uinfo, spec->channel_mode, - spec->num_channel_mode); -} - -static int ad198x_ch_mode_get(struct snd_kcontrol *kcontrol, - struct snd_ctl_elem_value *ucontrol) -{ - struct hda_codec *codec = snd_kcontrol_chip(kcontrol); - struct ad198x_spec *spec = codec->spec; - return snd_hda_ch_mode_get(codec, ucontrol, spec->channel_mode, - spec->num_channel_mode, spec->multiout.max_channels); -} - -static int ad198x_ch_mode_put(struct snd_kcontrol *kcontrol, - struct snd_ctl_elem_value *ucontrol) -{ - struct hda_codec *codec = snd_kcontrol_chip(kcontrol); - struct ad198x_spec *spec = codec->spec; - int err = snd_hda_ch_mode_put(codec, ucontrol, spec->channel_mode, - spec->num_channel_mode, - &spec->multiout.max_channels); - if (err >= 0 && spec->need_dac_fix) - spec->multiout.num_dacs = spec->multiout.max_channels / 2; - return err; -} -#endif /* ENABLE_AD_STATIC_QUIRKS */ - static int ad1988_auto_smux_enum_info(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_info *uinfo) {
Removes some functions that are not used anywhere: ad198x_ch_mode_get() ad198x_ch_mode_info() ad198x_ch_mode_info() This was partially found by using a static code analysis program called cppcheck. Signed-off-by: Rickard Strandqvist <rickard_strandqvist@spectrumdigital.se> --- sound/pci/hda/patch_analog.c | 33 --------------------------------- 1 file changed, 33 deletions(-)