Skip to content

Commit

Permalink
ASoC: switch over to use snd_soc_register_component() on mxs saif
Browse files Browse the repository at this point in the history
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 26, 2013
1 parent b1c3686 commit 026240b
Showing 1 changed file with 8 additions and 3 deletions.
11 changes: 8 additions & 3 deletions sound/soc/mxs/mxs-saif.c
Original file line number Diff line number Diff line change
Expand Up @@ -627,6 +627,10 @@ static struct snd_soc_dai_driver mxs_saif_dai = {
.ops = &mxs_saif_dai_ops,
};

static const struct snd_soc_component_driver mxs_saif_component = {
.name = "mxs-saif",
};

static irqreturn_t mxs_saif_irq(int irq, void *dev_id)
{
struct mxs_saif *saif = dev_id;
Expand Down Expand Up @@ -763,7 +767,8 @@ static int mxs_saif_probe(struct platform_device *pdev)

platform_set_drvdata(pdev, saif);

ret = snd_soc_register_dai(&pdev->dev, &mxs_saif_dai);
ret = snd_soc_register_component(&pdev->dev, &mxs_saif_component,
&mxs_saif_dai, 1);
if (ret) {
dev_err(&pdev->dev, "register DAI failed\n");
return ret;
Expand All @@ -778,15 +783,15 @@ static int mxs_saif_probe(struct platform_device *pdev)
return 0;

failed_pdev_alloc:
snd_soc_unregister_dai(&pdev->dev);
snd_soc_unregister_component(&pdev->dev);

return ret;
}

static int mxs_saif_remove(struct platform_device *pdev)
{
mxs_pcm_platform_unregister(&pdev->dev);
snd_soc_unregister_dai(&pdev->dev);
snd_soc_unregister_component(&pdev->dev);

return 0;
}
Expand Down

0 comments on commit 026240b

Please sign in to comment.