ASoC: switch over to use snd_soc_register_component() on omap dmic (ed22853a) · Commits · 戴 / test

sound/soc/omap/omap-dmic.c

+7 −2

Original line number	Diff line number	Diff line
		@@ -448,6 +448,10 @@ static struct snd_soc_dai_driver omap_dmic_dai = {
		.ops = &omap_dmic_dai_ops,
		};

		static const struct snd_soc_component_driver omap_dmic_component = {
		.name = "omap-dmic",
		};

		static int asoc_dmic_probe(struct platform_device *pdev)
		{
		struct omap_dmic *dmic;
		@@ -507,7 +511,8 @@ static int asoc_dmic_probe(struct platform_device *pdev)
		goto err_put_clk;
		}

		ret = snd_soc_register_dai(&pdev->dev, &omap_dmic_dai);
		ret = snd_soc_register_component(&pdev->dev, &omap_dmic_component,
		&omap_dmic_dai, 1);
		if (ret)
		goto err_put_clk;

		@@ -522,7 +527,7 @@ static int asoc_dmic_remove(struct platform_device *pdev)
		{
		struct omap_dmic *dmic = platform_get_drvdata(pdev);

		snd_soc_unregister_dai(&pdev->dev);
		snd_soc_unregister_component(&pdev->dev);
		clk_put(dmic->fclk);

		return 0;