ASoC: switch over to use snd_soc_register_component() on s6000 i2s (cd5e4d0b) · Commits · 戴 / test

sound/soc/s6000/s6000-i2s.c

+7 −2

Original line number	Diff line number	Diff line
		@@ -436,6 +436,10 @@ static struct snd_soc_dai_driver s6000_i2s_dai = {
		.ops = &s6000_i2s_dai_ops,
		};

		static const struct snd_soc_component_driver s6000_i2s_component = {
		.name = "s6000-i2s",
		};

		static int s6000_i2s_probe(struct platform_device *pdev)
		{
		struct s6000_i2s_dev *dev;
		@@ -543,7 +547,8 @@ static int s6000_i2s_probe(struct platform_device *pdev)
		S6_I2S_INT_UNDERRUN \|
		S6_I2S_INT_OVERRUN);

		ret = snd_soc_register_dai(&pdev->dev, &s6000_i2s_dai);
		ret = snd_soc_register_component(&pdev->dev, &s6000_i2s_component,
		&s6000_i2s_dai, 1);
		if (ret)
		goto err_release_dev;

		@@ -572,7 +577,7 @@ static void s6000_i2s_remove(struct platform_device *pdev)
		struct resource *region;
		void __iomem *mmio = dev->scbbase;

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

		s6000_i2s_stop_channel(dev, 0);
		s6000_i2s_stop_channel(dev, 1);