Commit ecf327c7 authored by Daniel Mack's avatar Daniel Mack Committed by Mark Brown
Browse files

ASoC: davinci-mcasp: clean up davinci_hw_common_param() 



As pointed of by Vaibhav, commit 2952b27e ("ASoC: davinci-mcasp:
Add support for multichannel playback") duplicated the logic of
counting the active serializers. That can be avoided by shifting
the code around a bit.

Also, drop two unused defines introduced by the same commit.

Signed-off-by: default avatarDaniel Mack <zonque@gmail.com>
Acked-by: default avatarVaibhav Bedia <vaibhav.bedia@ti.com>
Signed-off-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
parent 2952b27e

sound/soc/davinci/davinci-mcasp.c

+11 −23
Original line number Diff line number Diff line
@@ -237,8 +237,6 @@ 
#define RXSTATE		BIT(5)

#define SRMOD_MASK	3

#define SRMOD_INACTIVE	0

#define SRMOD_TX	1

#define SRMOD_RX	2



/*

 * DAVINCI_MCASP_LBCTL_REG - Loop Back Control Register Bits
@@ -686,27 +684,6 @@ static int davinci_hw_common_param(struct davinci_audio_dev *dev, int stream, 
				RXDATADMADIS);

	}



	for (i = 0; i < dev->num_serializer; i++) {

		if (dev->serial_dir[i] == TX_MODE)

			tx_ser++;

		if (dev->serial_dir[i] == RX_MODE)

			rx_ser++;

	}



	if (stream == SNDRV_PCM_STREAM_PLAYBACK)

		ser = tx_ser;

	else

		ser = rx_ser;



	if (ser < max_active_serializers) {

		dev_warn(dev->dev, "stream has more channels (%d) than are "

			"enabled in mcasp (%d)\n", channels, ser * slots);

		return -EINVAL;

	}



	tx_ser = 0;

	rx_ser = 0;



	for (i = 0; i < dev->num_serializer; i++) {

		mcasp_set_bits(dev->base + DAVINCI_MCASP_XRSRCTL_REG(i),

					dev->serial_dir[i]);
@@ -726,6 +703,17 @@ static int davinci_hw_common_param(struct davinci_audio_dev *dev, int stream, 
		}

	}



	if (stream == SNDRV_PCM_STREAM_PLAYBACK)

		ser = tx_ser;

	else

		ser = rx_ser;



	if (ser < max_active_serializers) {

		dev_warn(dev->dev, "stream has more channels (%d) than are "

			"enabled in mcasp (%d)\n", channels, ser * slots);

		return -EINVAL;

	}



	if (dev->txnumevt && stream == SNDRV_PCM_STREAM_PLAYBACK) {

		if (dev->txnumevt * tx_ser > 64)

			dev->txnumevt = 1;

CRA Git | Maintained and supported by SUSTech CRA and CCSE