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

Commit d6b6c2ca authored by Takashi Iwai's avatar Takashi Iwai Committed by Mark Brown
Browse files

ASoC: Simplify format_register_str() without stack usages 



Instead of allocating two string buffers on stack and copying them
back, manipulate directly the target string buffer.  This simplifies
the code well.

Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 9e498089

sound/soc/soc-core.c

+9 −18
Original line number Diff line number Diff line
@@ -92,30 +92,21 @@ static int format_register_str(struct snd_soc_codec *codec, 
	int wordsize = min_bytes_needed(codec->driver->reg_cache_size) * 2;

	int regsize = codec->driver->reg_word_size * 2;

	int ret;

	char tmpbuf[len + 1];

	char regbuf[regsize + 1];



	/* since tmpbuf is allocated on the stack, warn the callers if they

	 * try to abuse this function */

	WARN_ON(len > 63);



	/* +2 for ': ' and + 1 for '\n' */

	if (wordsize + regsize + 2 + 1 != len)

		return -EINVAL;



	ret = snd_soc_read(codec, reg);

	if (ret < 0) {

		memset(regbuf, 'X', regsize);

		regbuf[regsize] = '\0';

	} else {

		snprintf(regbuf, regsize + 1, "%.*x", regsize, ret);

	}



	/* prepare the buffer */

	snprintf(tmpbuf, len + 1, "%.*x: %s\n", wordsize, reg, regbuf);

	/* copy it back to the caller without the '\0' */

	memcpy(buf, tmpbuf, len);

	sprintf(buf, "%.*x: ", wordsize, reg);

	buf += wordsize + 2;



	ret = snd_soc_read(codec, reg);

	if (ret < 0)

		memset(buf, 'X', regsize);

	else

		sprintf(buf, "%.*x", regsize, ret);

	buf[regsize] = '\n';

	/* no NUL-termination needed */

	return 0;

}