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

Commit 986862bd authored by Takashi Iwai's avatar Takashi Iwai
Browse files

ALSA: hda - make some functions static 



Minor clean ups: move snd_hda_codecs_inuse() into hda_intel.c and
make static.  Also, make snd_hda_query_supported_pcm() static
as it's used only in hda_codec.c.

Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent 4f199629

sound/pci/hda/hda_codec.c

+1 −13
Original line number Original line Diff line number Diff line
@@ -2218,7 +2218,7 @@ unsigned int snd_hda_calc_stream_format(unsigned int rate, 
 *

 *

 * Returns 0 if successful, otherwise a negative error code.

 * Returns 0 if successful, otherwise a negative error code.

 */

 */

int snd_hda_query_supported_pcm(struct hda_codec *codec, hda_nid_t nid,

static int snd_hda_query_supported_pcm(struct hda_codec *codec, hda_nid_t nid,

				u32 *ratesp, u64 *formatsp, unsigned int *bpsp)

				u32 *ratesp, u64 *formatsp, unsigned int *bpsp)

{

{

	int i;

	int i;
@@ -3374,18 +3374,6 @@ int snd_hda_resume(struct hda_bus *bus) 
	}

	}

	return 0;

	return 0;

}

}

#ifdef CONFIG_SND_HDA_POWER_SAVE

int snd_hda_codecs_inuse(struct hda_bus *bus)

{

	struct hda_codec *codec;



	list_for_each_entry(codec, &bus->codec_list, list) {

		if (snd_hda_codec_needs_resume(codec))

			return 1;

	}

	return 0;

}

#endif

#endif

#endif





/*

/*

sound/pci/hda/hda_codec.h

+0 −4
Original line number Original line Diff line number Diff line
@@ -852,8 +852,6 @@ unsigned int snd_hda_calc_stream_format(unsigned int rate, 
					unsigned int channels,

					unsigned int channels,

					unsigned int format,

					unsigned int format,

					unsigned int maxbps);

					unsigned int maxbps);

int snd_hda_query_supported_pcm(struct hda_codec *codec, hda_nid_t nid,

				u32 *ratesp, u64 *formatsp, unsigned int *bpsp);

int snd_hda_is_supported_format(struct hda_codec *codec, hda_nid_t nid,

int snd_hda_is_supported_format(struct hda_codec *codec, hda_nid_t nid,

				unsigned int format);

				unsigned int format);
@@ -884,12 +882,10 @@ const char *snd_hda_get_jack_location(u32 cfg); 
void snd_hda_power_up(struct hda_codec *codec);

void snd_hda_power_up(struct hda_codec *codec);

void snd_hda_power_down(struct hda_codec *codec);

void snd_hda_power_down(struct hda_codec *codec);

#define snd_hda_codec_needs_resume(codec) codec->power_count

#define snd_hda_codec_needs_resume(codec) codec->power_count

int snd_hda_codecs_inuse(struct hda_bus *bus);

#else

#else

static inline void snd_hda_power_up(struct hda_codec *codec) {}

static inline void snd_hda_power_up(struct hda_codec *codec) {}

static inline void snd_hda_power_down(struct hda_codec *codec) {}

static inline void snd_hda_power_down(struct hda_codec *codec) {}

#define snd_hda_codec_needs_resume(codec) 1

#define snd_hda_codec_needs_resume(codec) 1

#define snd_hda_codecs_inuse(bus) 1

#endif

#endif





#endif /* __SOUND_HDA_CODEC_H */
 
#endif /* __SOUND_HDA_CODEC_H */

sound/pci/hda/hda_intel.c

+13 −0
Original line number Original line Diff line number Diff line
@@ -1896,6 +1896,19 @@ static void azx_power_notify(struct hda_bus *bus) 
	else if (chip->running && power_save_controller)

	else if (chip->running && power_save_controller)

		azx_stop_chip(chip);

		azx_stop_chip(chip);

}

}



static int snd_hda_codecs_inuse(struct hda_bus *bus)

{

	struct hda_codec *codec;



	list_for_each_entry(codec, &bus->codec_list, list) {

		if (snd_hda_codec_needs_resume(codec))

			return 1;

	}

	return 0;

}

#else /* !CONFIG_SND_HDA_POWER_SAVE */

#define snd_hda_codecs_inuse(bus) 1

#endif /* CONFIG_SND_HDA_POWER_SAVE */

#endif /* CONFIG_SND_HDA_POWER_SAVE */





#ifdef CONFIG_PM

#ifdef CONFIG_PM