Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 35a1e0cc authored by Takashi Iwai's avatar Takashi Iwai Committed by Jaroslav Kysela
Browse files

[ALSA] hda-codec - Fix build without CONFIG_SND_HDA_GENERIC 



Fixed the build error from patch_sigmatel.c when built without
CONFIG_SND_HDA_GENERIC by defining a dummy function to return error.
Also, clean up hda_codec.c by removing unneeded ifdefs (the compiler
will optimize out).

Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
Signed-off-by: default avatarJaroslav Kysela <perex@perex.cz>
parent c8229c38

sound/pci/hda/hda_codec.c

+2 −7
Original line number Diff line number Diff line
@@ -626,24 +626,19 @@ int __devinit snd_hda_codec_new(struct hda_bus *bus, unsigned int codec_addr, 
		snd_hda_get_codec_name(codec, bus->card->mixername,

				       sizeof(bus->card->mixername));



#ifdef CONFIG_SND_HDA_GENERIC

	if (is_generic_config(codec)) {

		err = snd_hda_parse_generic_codec(codec);

		goto patched;

	}

#endif

	if (codec->preset && codec->preset->patch) {

		err = codec->preset->patch(codec);

		goto patched;

	}



	/* call the default parser */

#ifdef CONFIG_SND_HDA_GENERIC

	err = snd_hda_parse_generic_codec(codec);

#else

	if (err < 0)

		printk(KERN_ERR "hda-codec: No codec parser is available\n");

	err = -ENODEV;

#endif



 patched:

	if (err < 0) {

sound/pci/hda/hda_local.h

+7 −0
Original line number Diff line number Diff line
@@ -245,7 +245,14 @@ int snd_hda_multi_out_analog_cleanup(struct hda_codec *codec, 
/*

 * generic codec parser

 */

#ifdef CONFIG_SND_HDA_GENERIC

int snd_hda_parse_generic_codec(struct hda_codec *codec);

#else

static inline int snd_hda_parse_generic_codec(struct hda_codec *codec)

{

	return -ENODEV;

}

#endif



/*

 * generic proc interface