Commit f71ff0d7 authored by Takashi Iwai's avatar Takashi Iwai
Browse files

ALSA: hda - Moved snd_print_pcm_rates() back into hda_proc.c 



Since hda_proc.c is now the only user of snd_print_pcm_rates(), better to
put it back locally to hda_proc.c and revert to the old style.

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

sound/pci/hda/hda_codec.c

+0 −24
Original line number Diff line number Diff line
@@ -5199,30 +5199,6 @@ void snd_array_free(struct snd_array *array) 
}

EXPORT_SYMBOL_HDA(snd_array_free);



/**

 * snd_print_pcm_rates - Print the supported PCM rates to the string buffer

 * @pcm: PCM caps bits

 * @buf: the string buffer to write

 * @buflen: the max buffer length

 *

 * used by hda_proc.c

 */

void snd_print_pcm_rates(int pcm, char *buf, int buflen)

{

	static unsigned int rates[] = {

		8000, 11025, 16000, 22050, 32000, 44100, 48000, 88200,

		96000, 176400, 192000, 384000

	};

	int i, j;



	for (i = 0, j = 0; i < ARRAY_SIZE(rates); i++)

		if (pcm & (1 << i))

			j += snprintf(buf + j, buflen - j,  " %d", rates[i]);



	buf[j] = '\0'; /* necessary when j == 0 */

}

EXPORT_SYMBOL_HDA(snd_print_pcm_rates);



/**

 * snd_print_pcm_bits - Print the supported PCM fmt bits to the string buffer

 * @pcm: PCM caps bits

sound/pci/hda/hda_eld.c

+2 −0
Original line number Diff line number Diff line
@@ -383,6 +383,8 @@ static void hdmi_print_pcm_rates(int pcm, char *buf, int buflen) 
	buf[j] = '\0'; /* necessary when j == 0 */

}



#define SND_PRINT_RATES_ADVISED_BUFSIZE	80



static void hdmi_show_short_audio_desc(struct cea_sad *a)

{

	char buf[SND_PRINT_RATES_ADVISED_BUFSIZE];

sound/pci/hda/hda_local.h

+0 −3
Original line number Diff line number Diff line
@@ -336,9 +336,6 @@ int snd_hda_codec_proc_new(struct hda_codec *codec); 
static inline int snd_hda_codec_proc_new(struct hda_codec *codec) { return 0; }

#endif



#define SND_PRINT_RATES_ADVISED_BUFSIZE	80

void snd_print_pcm_rates(int pcm, char *buf, int buflen);



#define SND_PRINT_BITS_ADVISED_BUFSIZE	16

void snd_print_pcm_bits(int pcm, char *buf, int buflen);

sound/pci/hda/hda_proc.c

+9 −3
Original line number Diff line number Diff line
@@ -152,12 +152,18 @@ static void print_amp_vals(struct snd_info_buffer *buffer, 


static void print_pcm_rates(struct snd_info_buffer *buffer, unsigned int pcm)

{

	char buf[SND_PRINT_RATES_ADVISED_BUFSIZE];

	static unsigned int rates[] = {

		8000, 11025, 16000, 22050, 32000, 44100, 48000, 88200,

		96000, 176400, 192000, 384000

	};

	int i;



	pcm &= AC_SUPPCM_RATES;

	snd_iprintf(buffer, "    rates [0x%x]:", pcm);

	snd_print_pcm_rates(pcm, buf, sizeof(buf));

	snd_iprintf(buffer, "%s\n", buf);

	for (i = 0; i < ARRAY_SIZE(rates); i++)

		if (pcm & (1 << i))

			snd_iprintf(buffer,  " %d", rates[i]);

	snd_iprintf(buffer, "\n");

}



static void print_pcm_bits(struct snd_info_buffer *buffer, unsigned int pcm)