ASoC: davinci-i2s: replace platform to component

Now platform can be replaced to component, let's do it.

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
Kuninori Morimoto 2018-01-29 02:46:04 +00:00 коммит произвёл Mark Brown
Родитель a20863256f
Коммит a49cb31cc7
Не найден ключ, соответствующий данной подписи
Идентификатор ключа GPG: 24D68B725D5487D0
1 изменённых файлов: 7 добавлений и 6 удалений

Просмотреть файл

@ -34,6 +34,7 @@
#include "edma-pcm.h" #include "edma-pcm.h"
#include "davinci-i2s.h" #include "davinci-i2s.h"
#define DRV_NAME "davinci-i2s"
/* /*
* NOTE: terminology here is confusing. * NOTE: terminology here is confusing.
@ -190,7 +191,7 @@ static void davinci_mcbsp_start(struct davinci_mcbsp_dev *dev,
struct snd_pcm_substream *substream) struct snd_pcm_substream *substream)
{ {
struct snd_soc_pcm_runtime *rtd = substream->private_data; struct snd_soc_pcm_runtime *rtd = substream->private_data;
struct snd_soc_platform *platform = rtd->platform; struct snd_soc_component *component = snd_soc_rtdcom_lookup(rtd, DRV_NAME);
int playback = (substream->stream == SNDRV_PCM_STREAM_PLAYBACK); int playback = (substream->stream == SNDRV_PCM_STREAM_PLAYBACK);
u32 spcr; u32 spcr;
u32 mask = playback ? DAVINCI_MCBSP_SPCR_XRST : DAVINCI_MCBSP_SPCR_RRST; u32 mask = playback ? DAVINCI_MCBSP_SPCR_XRST : DAVINCI_MCBSP_SPCR_RRST;
@ -211,8 +212,8 @@ static void davinci_mcbsp_start(struct davinci_mcbsp_dev *dev,
if (playback) { if (playback) {
/* Stop the DMA to avoid data loss */ /* Stop the DMA to avoid data loss */
/* while the transmitter is out of reset to handle XSYNCERR */ /* while the transmitter is out of reset to handle XSYNCERR */
if (platform->driver->ops->trigger) { if (component->driver->ops->trigger) {
int ret = platform->driver->ops->trigger(substream, int ret = component->driver->ops->trigger(substream,
SNDRV_PCM_TRIGGER_STOP); SNDRV_PCM_TRIGGER_STOP);
if (ret < 0) if (ret < 0)
printk(KERN_DEBUG "Playback DMA stop failed\n"); printk(KERN_DEBUG "Playback DMA stop failed\n");
@ -233,8 +234,8 @@ static void davinci_mcbsp_start(struct davinci_mcbsp_dev *dev,
toggle_clock(dev, playback); toggle_clock(dev, playback);
/* Restart the DMA */ /* Restart the DMA */
if (platform->driver->ops->trigger) { if (component->driver->ops->trigger) {
int ret = platform->driver->ops->trigger(substream, int ret = component->driver->ops->trigger(substream,
SNDRV_PCM_TRIGGER_START); SNDRV_PCM_TRIGGER_START);
if (ret < 0) if (ret < 0)
printk(KERN_DEBUG "Playback DMA start failed\n"); printk(KERN_DEBUG "Playback DMA start failed\n");
@ -651,7 +652,7 @@ static struct snd_soc_dai_driver davinci_i2s_dai = {
}; };
static const struct snd_soc_component_driver davinci_i2s_component = { static const struct snd_soc_component_driver davinci_i2s_component = {
.name = "davinci-i2s", .name = DRV_NAME,
}; };
static int davinci_i2s_probe(struct platform_device *pdev) static int davinci_i2s_probe(struct platform_device *pdev)