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

Commit 3c9a3203 authored by Harvey Harrison's avatar Harvey Harrison Committed by Takashi Iwai
Browse files

[ALSA] sound: hda: missing includes of hda_patch.h 



Move the array declaration to hda_codec.c where it is used and add includes
where the individual presets are declared.

Fixes the following sparse warnings:
sound/pci/hda/patch_realtek.c:13744:25: warning: symbol 'snd_hda_preset_realtek' was not declared. Should it be static?
sound/pci/hda/patch_cmedia.c:729:25: warning: symbol 'snd_hda_preset_cmedia' was not declared. Should it be static?
sound/pci/hda/patch_analog.c:3656:25: warning: symbol 'snd_hda_preset_analog' was not declared. Should it be static?
sound/pci/hda/patch_sigmatel.c:3995:25: warning: symbol 'snd_hda_preset_sigmatel' was not declared. Should it be static?
sound/pci/hda/patch_si3054.c:286:25: warning: symbol 'snd_hda_preset_si3054' was not declared. Should it be static?
sound/pci/hda/patch_atihdmi.c:156:25: warning: symbol 'snd_hda_preset_atihdmi' was not declared. Should it be static?
sound/pci/hda/patch_conexant.c:1721:25: warning: symbol 'snd_hda_preset_conexant' was not declared. Should it be static?
sound/pci/hda/patch_via.c:1962:25: warning: symbol 'snd_hda_preset_via' was not declared. Should it be static?

Signed-off-by: default avatarHarvey Harrison <harvey.harrison@gmail.com>
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent 64ed0dfd

sound/pci/hda/hda_codec.c

+28 −3
Original line number Diff line number Diff line
@@ -31,6 +31,7 @@ 
#include <sound/initval.h>

#include "hda_local.h"

#include <sound/hda_hwdep.h>

#include "hda_patch.h"	/* codec presets */



#ifdef CONFIG_SND_HDA_POWER_SAVE

/* define this option here to hide as static */
@@ -68,9 +69,33 @@ static struct hda_vendor_id hda_vendor_ids[] = { 
	{} /* terminator */

};



/* codec presets */

#include "hda_patch.h"



static const struct hda_codec_preset *hda_preset_tables[] = {

#ifdef CONFIG_SND_HDA_CODEC_REALTEK

	snd_hda_preset_realtek,

#endif

#ifdef CONFIG_SND_HDA_CODEC_CMEDIA

	snd_hda_preset_cmedia,

#endif

#ifdef CONFIG_SND_HDA_CODEC_ANALOG

	snd_hda_preset_analog,

#endif

#ifdef CONFIG_SND_HDA_CODEC_SIGMATEL

	snd_hda_preset_sigmatel,

#endif

#ifdef CONFIG_SND_HDA_CODEC_SI3054

	snd_hda_preset_si3054,

#endif

#ifdef CONFIG_SND_HDA_CODEC_ATIHDMI

	snd_hda_preset_atihdmi,

#endif

#ifdef CONFIG_SND_HDA_CODEC_CONEXANT

	snd_hda_preset_conexant,

#endif

#ifdef CONFIG_SND_HDA_CODEC_VIA

	snd_hda_preset_via,

#endif

	NULL

};



#ifdef CONFIG_SND_HDA_POWER_SAVE

static void hda_power_work(struct work_struct *work);

sound/pci/hda/hda_patch.h

+0 −28
Original line number Diff line number Diff line
@@ -18,31 +18,3 @@ extern struct hda_codec_preset snd_hda_preset_atihdmi[]; 
extern struct hda_codec_preset snd_hda_preset_conexant[];

/* VIA codecs */

extern struct hda_codec_preset snd_hda_preset_via[];
 


static const struct hda_codec_preset *hda_preset_tables[] = {

#ifdef CONFIG_SND_HDA_CODEC_REALTEK

	snd_hda_preset_realtek,

#endif

#ifdef CONFIG_SND_HDA_CODEC_CMEDIA

	snd_hda_preset_cmedia,

#endif

#ifdef CONFIG_SND_HDA_CODEC_ANALOG

	snd_hda_preset_analog,

#endif

#ifdef CONFIG_SND_HDA_CODEC_SIGMATEL

	snd_hda_preset_sigmatel,

#endif

#ifdef CONFIG_SND_HDA_CODEC_SI3054

	snd_hda_preset_si3054,

#endif

#ifdef CONFIG_SND_HDA_CODEC_ATIHDMI

	snd_hda_preset_atihdmi,

#endif

#ifdef CONFIG_SND_HDA_CODEC_CONEXANT

	snd_hda_preset_conexant,

#endif

#ifdef CONFIG_SND_HDA_CODEC_VIA

	snd_hda_preset_via,

#endif

	NULL

};

sound/pci/hda/patch_analog.c

+1 −0
Original line number Diff line number Diff line
@@ -28,6 +28,7 @@ 
#include <sound/core.h>

#include "hda_codec.h"

#include "hda_local.h"

#include "hda_patch.h"



struct ad198x_spec {

	struct snd_kcontrol_new *mixers[5];

sound/pci/hda/patch_atihdmi.c

+1 −0
Original line number Diff line number Diff line
@@ -27,6 +27,7 @@ 
#include <sound/core.h>

#include "hda_codec.h"

#include "hda_local.h"

#include "hda_patch.h"



struct atihdmi_spec {

	struct hda_multi_out multiout;

sound/pci/hda/patch_cmedia.c

+1 −0
Original line number Diff line number Diff line
@@ -28,6 +28,7 @@ 
#include <sound/core.h>

#include "hda_codec.h"

#include "hda_local.h"

#include "hda_patch.h"

#define NUM_PINS	11