ALSA: pcxhr: Kill the rest snd_print*() (f48a6df2) · Commits · e / devices / android_kernel_xiaomi_nabu

sound/pci/pcxhr/pcxhr.c

+21 −21

Original line number	Diff line number	Diff line
		@@ -501,10 +501,10 @@ int pcxhr_get_external_clock(struct pcxhr_mgr *mgr,
		/*
		* start or stop playback/capture substream
		*/
		static int pcxhr_set_stream_state(struct pcxhr_stream *stream)
		static int pcxhr_set_stream_state(struct snd_pcxhr *chip,
		struct pcxhr_stream *stream)
		{
		int err;
		struct snd_pcxhr *chip;
		struct pcxhr_rmh rmh;
		int stream_mask, start;

		@@ -512,8 +512,8 @@ static int pcxhr_set_stream_state(struct pcxhr_stream *stream)
		start = 1;
		else {
		if (stream->status != PCXHR_STREAM_STATUS_SCHEDULE_STOP) {
		snd_printk(KERN_ERR "ERROR pcxhr_set_stream_state "
		"CANNOT be stopped\n");
		dev_err(chip->card->dev,
		"pcxhr_set_stream_state CANNOT be stopped\n");
		return -EINVAL;
		}
		start = 0;
		@@ -560,6 +560,7 @@ static int pcxhr_set_format(struct pcxhr_stream *stream)
		struct pcxhr_rmh rmh;
		unsigned int header;

		chip = snd_pcm_substream_chip(stream->substream);
		switch (stream->format) {
		case SNDRV_PCM_FORMAT_U8:
		header = HEADER_FMT_BASE_LIN;
		@@ -582,11 +583,10 @@ static int pcxhr_set_format(struct pcxhr_stream *stream)
		header = HEADER_FMT_BASE_FLOAT \| HEADER_FMT_INTEL;
		break;
		default:
		snd_printk(KERN_ERR
		dev_err(chip->card->dev,
		"error pcxhr_set_format() : unknown format\n");
		return -EINVAL;
		}
		chip = snd_pcm_substream_chip(stream->substream);

		sample_rate = chip->mgr->sample_rate;
		if (sample_rate <= 32000 && sample_rate !=0) {
		@@ -643,8 +643,8 @@ static int pcxhr_update_r_buffer(struct pcxhr_stream *stream)
		is_capture = (subs->stream == SNDRV_PCM_STREAM_CAPTURE);
		stream_num = is_capture ? 0 : subs->number;

		snd_printdd("pcxhr_update_r_buffer(pcm%c%d) : "
		"addr(%p) bytes(%zx) subs(%d)\n",
		dev_dbg(chip->card->dev,
		"pcxhr_update_r_buffer(pcm%c%d) : addr(%p) bytes(%zx) subs(%d)\n",
		is_capture ? 'c' : 'p',
		chip->chip_idx, (void *)(long)subs->runtime->dma_addr,
		subs->runtime->dma_bytes, subs->number);
		@@ -687,7 +687,7 @@ static int pcxhr_pipe_sample_count(struct pcxhr_stream *stream,
		*sample_count = ((snd_pcm_uframes_t)rmh.stat[0]) << 24;
		*sample_count += (snd_pcm_uframes_t)rmh.stat[1];
		}
		snd_printdd("PIPE_SAMPLE_COUNT = %lx\n", *sample_count);
		dev_dbg(chip->card->dev, "PIPE_SAMPLE_COUNT = %lx\n", *sample_count);
		return err;
		}
		#endif
		@@ -779,12 +779,12 @@ static void pcxhr_start_linked_stream(struct pcxhr_mgr *mgr)
		for (j = 0; j < chip->nb_streams_capt; j++) {
		stream = &chip->capture_stream[j];
		if (pcxhr_stream_scheduled_get_pipe(stream, &pipe))
		err = pcxhr_set_stream_state(stream);
		err = pcxhr_set_stream_state(chip, stream);
		}
		for (j = 0; j < chip->nb_streams_play; j++) {
		stream = &chip->playback_stream[j];
		if (pcxhr_stream_scheduled_get_pipe(stream, &pipe))
		err = pcxhr_set_stream_state(stream);
		err = pcxhr_set_stream_state(chip, stream);
		}
		}

		@@ -839,12 +839,12 @@ static int pcxhr_trigger(struct snd_pcm_substream *subs, int cmd)
		{
		struct pcxhr_stream *stream;
		struct snd_pcm_substream *s;
		struct snd_pcxhr *chip = snd_pcm_substream_chip(subs);

		switch (cmd) {
		case SNDRV_PCM_TRIGGER_START:
		snd_printdd("SNDRV_PCM_TRIGGER_START\n");
		dev_dbg(chip->card->dev, "SNDRV_PCM_TRIGGER_START\n");
		if (snd_pcm_stream_linked(subs)) {
		struct snd_pcxhr *chip = snd_pcm_substream_chip(subs);
		snd_pcm_group_for_each_entry(s, subs) {
		if (snd_pcm_substream_chip(s) != chip)
		continue;
		@@ -856,7 +856,7 @@ static int pcxhr_trigger(struct snd_pcm_substream *subs, int cmd)
		pcxhr_start_linked_stream(chip->mgr);
		} else {
		stream = subs->runtime->private_data;
		snd_printdd("Only one Substream %c %d\n",
		dev_dbg(chip->card->dev, "Only one Substream %c %d\n",
		stream->pipe->is_capture ? 'C' : 'P',
		stream->pipe->first_audio);
		if (pcxhr_set_format(stream))
		@@ -865,17 +865,17 @@ static int pcxhr_trigger(struct snd_pcm_substream *subs, int cmd)
		return -EINVAL;

		stream->status = PCXHR_STREAM_STATUS_SCHEDULE_RUN;
		if (pcxhr_set_stream_state(stream))
		if (pcxhr_set_stream_state(chip, stream))
		return -EINVAL;
		stream->status = PCXHR_STREAM_STATUS_RUNNING;
		}
		break;
		case SNDRV_PCM_TRIGGER_STOP:
		snd_printdd("SNDRV_PCM_TRIGGER_STOP\n");
		dev_dbg(chip->card->dev, "SNDRV_PCM_TRIGGER_STOP\n");
		snd_pcm_group_for_each_entry(s, subs) {
		stream = s->runtime->private_data;
		stream->status = PCXHR_STREAM_STATUS_SCHEDULE_STOP;
		if (pcxhr_set_stream_state(stream))
		if (pcxhr_set_stream_state(chip, stream))
		return -EINVAL;
		snd_pcm_trigger_done(s, subs);
		}