Commit c6706de0 authored by Takashi Sakamoto's avatar Takashi Sakamoto Committed by Takashi Iwai
Browse files

ALSA: pcm: obsolete RULES_DEBUG local macro 



Added tracepoints obsoleted RULES_DEBUG local macro and relevant codes.

Signed-off-by: default avatarTakashi Sakamoto <o-takashi@sakamocchi.jp>
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent 37567c55

sound/core/pcm_native.c

+7 −82
Original line number Diff line number Diff line
@@ -253,29 +253,6 @@ static bool hw_support_mmap(struct snd_pcm_substream *substream) 
	return true;

}



#undef RULES_DEBUG



#ifdef RULES_DEBUG

#define HW_PARAM(v) [SNDRV_PCM_HW_PARAM_##v] = #v

static const char * const snd_pcm_hw_param_names[] = {

	HW_PARAM(ACCESS),

	HW_PARAM(FORMAT),

	HW_PARAM(SUBFORMAT),

	HW_PARAM(SAMPLE_BITS),

	HW_PARAM(FRAME_BITS),

	HW_PARAM(CHANNELS),

	HW_PARAM(RATE),

	HW_PARAM(PERIOD_TIME),

	HW_PARAM(PERIOD_SIZE),

	HW_PARAM(PERIOD_BYTES),

	HW_PARAM(PERIODS),

	HW_PARAM(BUFFER_TIME),

	HW_PARAM(BUFFER_SIZE),

	HW_PARAM(BUFFER_BYTES),

	HW_PARAM(TICK_TIME),

};

#endif



int snd_pcm_hw_refine(struct snd_pcm_substream *substream, 

		      struct snd_pcm_hw_params *params)

{
@@ -310,14 +287,9 @@ int snd_pcm_hw_refine(struct snd_pcm_substream *substream, 


		if (trace_hw_mask_param_enabled())

			old_mask = *m;

#ifdef RULES_DEBUG

		pr_debug("%s = ", snd_pcm_hw_param_names[k]);

		pr_cont("%04x%04x%04x%04x -> ", m->bits[3], m->bits[2], m->bits[1], m->bits[0]);

#endif



		changed = snd_mask_refine(m, constrs_mask(constrs, k));

#ifdef RULES_DEBUG

		pr_cont("%04x%04x%04x%04x\n", m->bits[3], m->bits[2], m->bits[1], m->bits[0]);

#endif



		trace_hw_mask_param(substream, k, 0, &old_mask, m);



		if (changed)
@@ -335,25 +307,9 @@ int snd_pcm_hw_refine(struct snd_pcm_substream *substream, 


		if (trace_hw_interval_param_enabled())

			old_interval = *i;

#ifdef RULES_DEBUG

		pr_debug("%s = ", snd_pcm_hw_param_names[k]);

		if (i->empty)

			pr_cont("empty");

		else

			pr_cont("%c%u %u%c",

			       i->openmin ? '(' : '[', i->min,

			       i->max, i->openmax ? ')' : ']');

		pr_cont(" -> ");

#endif



		changed = snd_interval_refine(i, constrs_interval(constrs, k));

#ifdef RULES_DEBUG

		if (i->empty)

			pr_cont("empty\n");

		else 

			pr_cont("%c%u %u%c\n",

			       i->openmin ? '(' : '[', i->min,

			       i->max, i->openmax ? ')' : ']');

#endif



		trace_hw_interval_param(substream, k, 0, &old_interval, i);



		if (changed)
@@ -391,41 +347,9 @@ int snd_pcm_hw_refine(struct snd_pcm_substream *substream, 
				if (hw_is_interval(r->var))

					old_interval = *hw_param_interval(params, r->var);

			}

#ifdef RULES_DEBUG

			pr_debug("Rule %d [%p]: ", k, r->func);

			if (r->var >= 0) {

				pr_cont("%s = ", snd_pcm_hw_param_names[r->var]);

				if (hw_is_mask(r->var)) {

					m = hw_param_mask(params, r->var);

					pr_cont("%x", *m->bits);

				} else {

					i = hw_param_interval(params, r->var);

					if (i->empty)

						pr_cont("empty");

					else

						pr_cont("%c%u %u%c",

						       i->openmin ? '(' : '[', i->min,

						       i->max, i->openmax ? ')' : ']');

				}

			}

#endif



			changed = r->func(params, r);

#ifdef RULES_DEBUG

			if (r->var >= 0) {

				pr_cont(" -> ");

				if (hw_is_mask(r->var))

					pr_cont("%x", *m->bits);

				else {

					if (i->empty)

						pr_cont("empty");

					else

						pr_cont("%c%u %u%c",

						       i->openmin ? '(' : '[', i->min,

						       i->max, i->openmax ? ')' : ']');

				}

			}

			pr_cont("\n");

#endif



			if (hw_is_mask(r->var)) {

				trace_hw_mask_param(substream, r->var, k + 1,

					&old_mask, hw_param_mask(params, r->var));
@@ -434,6 +358,7 @@ int snd_pcm_hw_refine(struct snd_pcm_substream *substream, 
				trace_hw_interval_param(substream, r->var, k + 1,

					&old_interval, hw_param_interval(params, r->var));

			}



			rstamps[k] = stamp;

			if (changed && r->var >= 0) {

				params->cmask |= (1 << r->var);