|
@@ -353,9 +353,8 @@ static int davinci_i2s_hw_params(struct snd_pcm_substream *substream,
|
|
|
struct snd_pcm_hw_params *params,
|
|
|
struct snd_soc_dai *dai)
|
|
|
{
|
|
|
- struct snd_soc_pcm_runtime *rtd = substream->private_data;
|
|
|
- struct davinci_pcm_dma_params *dma_params = rtd->dai->cpu_dai->dma_data;
|
|
|
- struct davinci_mcbsp_dev *dev = rtd->dai->cpu_dai->private_data;
|
|
|
+ struct davinci_pcm_dma_params *dma_params = dai->dma_data;
|
|
|
+ struct davinci_mcbsp_dev *dev = dai->private_data;
|
|
|
struct snd_interval *i = NULL;
|
|
|
int mcbsp_word_length;
|
|
|
unsigned int rcr, xcr, srgr;
|
|
@@ -425,8 +424,7 @@ static int davinci_i2s_hw_params(struct snd_pcm_substream *substream,
|
|
|
static int davinci_i2s_prepare(struct snd_pcm_substream *substream,
|
|
|
struct snd_soc_dai *dai)
|
|
|
{
|
|
|
- struct snd_soc_pcm_runtime *rtd = substream->private_data;
|
|
|
- struct davinci_mcbsp_dev *dev = rtd->dai->cpu_dai->private_data;
|
|
|
+ struct davinci_mcbsp_dev *dev = dai->private_data;
|
|
|
int playback = (substream->stream == SNDRV_PCM_STREAM_PLAYBACK);
|
|
|
davinci_mcbsp_stop(dev, playback);
|
|
|
if ((dev->pcr & DAVINCI_MCBSP_PCR_FSXM) == 0) {
|
|
@@ -439,8 +437,7 @@ static int davinci_i2s_prepare(struct snd_pcm_substream *substream,
|
|
|
static int davinci_i2s_trigger(struct snd_pcm_substream *substream, int cmd,
|
|
|
struct snd_soc_dai *dai)
|
|
|
{
|
|
|
- struct snd_soc_pcm_runtime *rtd = substream->private_data;
|
|
|
- struct davinci_mcbsp_dev *dev = rtd->dai->cpu_dai->private_data;
|
|
|
+ struct davinci_mcbsp_dev *dev = dai->private_data;
|
|
|
int ret = 0;
|
|
|
int playback = (substream->stream == SNDRV_PCM_STREAM_PLAYBACK);
|
|
|
if ((dev->pcr & DAVINCI_MCBSP_PCR_FSXM) == 0)
|
|
@@ -466,8 +463,7 @@ static int davinci_i2s_trigger(struct snd_pcm_substream *substream, int cmd,
|
|
|
static void davinci_i2s_shutdown(struct snd_pcm_substream *substream,
|
|
|
struct snd_soc_dai *dai)
|
|
|
{
|
|
|
- struct snd_soc_pcm_runtime *rtd = substream->private_data;
|
|
|
- struct davinci_mcbsp_dev *dev = rtd->dai->cpu_dai->private_data;
|
|
|
+ struct davinci_mcbsp_dev *dev = dai->private_data;
|
|
|
int playback = (substream->stream == SNDRV_PCM_STREAM_PLAYBACK);
|
|
|
davinci_mcbsp_stop(dev, playback);
|
|
|
}
|