Unverified Commit 98059ddf authored by Shang XiaoJing's avatar Shang XiaoJing Committed by Mark Brown
Browse files

ASoC: ti: davinci-mcasp: Use DIV_ROUND_UP() instead of open-coding it 



Use DIV_ROUND_UP() instead of open-coding it, which intents and makes it
more clear what is going on for the casual reviewer.

The Coccinelle references Commit e4d8aef2 ("ALSA: usb: Use
DIV_ROUND_UP() instead of open-coding it").

Signed-off-by: default avatarShang XiaoJing <shangxiaojing@huawei.com>
Link: https://lore.kernel.org/r/20220927140948.17696-5-shangxiaojing@huawei.com


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 4aa2b05a

sound/soc/ti/davinci-mcasp.c

+3 −4
Original line number Diff line number Diff line
@@ -869,7 +869,7 @@ static int mcasp_common_hw_param(struct davinci_mcasp *mcasp, int stream, 
	if (mcasp->op_mode == DAVINCI_MCASP_DIT_MODE)

		max_active_serializers = 1;

	else

		max_active_serializers = (channels + slots - 1) / slots;

		max_active_serializers = DIV_ROUND_UP(channels, slots);



	/* Default configuration */

	if (mcasp->version < MCASP_VERSION_3)
@@ -1002,8 +1002,7 @@ static int mcasp_i2s_hw_param(struct davinci_mcasp *mcasp, int stream, 
	 */

	if (mcasp->tdm_mask[stream]) {

		active_slots = hweight32(mcasp->tdm_mask[stream]);

		active_serializers = (channels + active_slots - 1) /

			active_slots;

		active_serializers = DIV_ROUND_UP(channels, active_slots);

		if (active_serializers == 1)

			active_slots = channels;

		for (i = 0; i < total_slots; i++) {
@@ -1014,7 +1013,7 @@ static int mcasp_i2s_hw_param(struct davinci_mcasp *mcasp, int stream, 
			}

		}

	} else {

		active_serializers = (channels + total_slots - 1) / total_slots;

		active_serializers = DIV_ROUND_UP(channels, total_slots);

		if (active_serializers == 1)

			active_slots = channels;

		else