Skip to content

Commit

Permalink
ASoC: fsi: use snd_soc_register_component() instead of snd_soc_regist…
Browse files Browse the repository at this point in the history
…er_dais()

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
  • Loading branch information
Kuninori Morimoto authored and Mark Brown committed Mar 15, 2013
1 parent 61782e4 commit da4f2f9
Showing 1 changed file with 8 additions and 4 deletions.
12 changes: 8 additions & 4 deletions sound/soc/sh/fsi.c
Original file line number Diff line number Diff line change
Expand Up @@ -1886,6 +1886,10 @@ static struct snd_soc_platform_driver fsi_soc_platform = {
.pcm_free = fsi_pcm_free,
};

static const struct snd_soc_component_driver fsi_soc_component = {
.name = "fsi",
};

/*
* platform function
*/
Expand Down Expand Up @@ -2046,10 +2050,10 @@ static int fsi_probe(struct platform_device *pdev)
goto exit_fsib;
}

ret = snd_soc_register_dais(&pdev->dev, fsi_soc_dai,
ARRAY_SIZE(fsi_soc_dai));
ret = snd_soc_register_component(&pdev->dev, &fsi_soc_component,
fsi_soc_dai, ARRAY_SIZE(fsi_soc_dai));
if (ret < 0) {
dev_err(&pdev->dev, "cannot snd dai register\n");
dev_err(&pdev->dev, "cannot snd component register\n");
goto exit_snd_soc;
}

Expand All @@ -2074,7 +2078,7 @@ static int fsi_remove(struct platform_device *pdev)

pm_runtime_disable(&pdev->dev);

snd_soc_unregister_dais(&pdev->dev, ARRAY_SIZE(fsi_soc_dai));
snd_soc_unregister_component(&pdev->dev);
snd_soc_unregister_platform(&pdev->dev);

fsi_stream_remove(&master->fsia);
Expand Down

0 comments on commit da4f2f9

Please sign in to comment.