Skip to content

Commit

Permalink
ASoC: atmel: atmel_ssc_dai: move .suspend/.resume to component
Browse files Browse the repository at this point in the history
There is no big difference at implementation for .suspend/.resume
between DAI driver and Component driver.
But because some driver is using DAI version, thus ALSA SoC needs
to keep supporting it, hence, framework becoming verbose.
If we can switch all DAI driver .suspend/.resume to Component driver,
we can remove verbose code from ALSA SoC.

Driver is getting its private data via dai->dev.
But dai->dev and component->dev are same dev, thus, we can convert
these. For same reason, we can convert dai->active to
component->active if necessary.

This patch moves DAI driver .suspend/.resume to Component driver

Signed-off-by: Kuninori Morimoto <[email protected]>
Link: https://lore.kernel.org/r/[email protected]
Signed-off-by: Mark Brown <[email protected]>
  • Loading branch information
morimoto authored and broonie committed Jan 21, 2020
1 parent 7307d33 commit e4f8bb3
Showing 1 changed file with 8 additions and 10 deletions.
18 changes: 8 additions & 10 deletions sound/soc/atmel/atmel_ssc_dai.c
Original file line number Diff line number Diff line change
Expand Up @@ -760,12 +760,12 @@ static int atmel_ssc_trigger(struct snd_pcm_substream *substream,
}

#ifdef CONFIG_PM
static int atmel_ssc_suspend(struct snd_soc_dai *cpu_dai)
static int atmel_ssc_suspend(struct snd_soc_component *component)
{
struct atmel_ssc_info *ssc_p;
struct platform_device *pdev = to_platform_device(cpu_dai->dev);
struct platform_device *pdev = to_platform_device(component->dev);

if (!cpu_dai->active)
if (!component->active)
return 0;

ssc_p = &ssc_info[pdev->id];
Expand All @@ -787,15 +787,13 @@ static int atmel_ssc_suspend(struct snd_soc_dai *cpu_dai)
return 0;
}



static int atmel_ssc_resume(struct snd_soc_dai *cpu_dai)
static int atmel_ssc_resume(struct snd_soc_component *component)
{
struct atmel_ssc_info *ssc_p;
struct platform_device *pdev = to_platform_device(cpu_dai->dev);
struct platform_device *pdev = to_platform_device(component->dev);
u32 cr;

if (!cpu_dai->active)
if (!component->active)
return 0;

ssc_p = &ssc_info[pdev->id];
Expand Down Expand Up @@ -839,8 +837,6 @@ static const struct snd_soc_dai_ops atmel_ssc_dai_ops = {
};

static struct snd_soc_dai_driver atmel_ssc_dai = {
.suspend = atmel_ssc_suspend,
.resume = atmel_ssc_resume,
.playback = {
.channels_min = 1,
.channels_max = 2,
Expand All @@ -860,6 +856,8 @@ static struct snd_soc_dai_driver atmel_ssc_dai = {

static const struct snd_soc_component_driver atmel_ssc_component = {
.name = "atmel-ssc",
.suspend = atmel_ssc_suspend,
.resume = atmel_ssc_resume,
};

static int asoc_ssc_init(struct device *dev)
Expand Down

0 comments on commit e4f8bb3

Please sign in to comment.