ASoC: sh: fsi: replace platform to component (f5a82fa6) · Commits · 戴 / test

sound/soc/sh/fsi.c

+5 −19

Original line number	Diff line number	Diff line
		@@ -1764,7 +1764,7 @@ static const struct snd_pcm_ops fsi_pcm_ops = {
		};

		/*
		* snd_soc_platform
		* snd_soc_component
		*/

		#define PREALLOC_BUFFER (32 * 1024)
		@@ -1818,13 +1818,10 @@ static struct snd_soc_dai_driver fsi_soc_dai[] = {
		},
		};

		static const struct snd_soc_platform_driver fsi_soc_platform = {
		.ops = &fsi_pcm_ops,
		.pcm_new = fsi_pcm_new,
		};

		static const struct snd_soc_component_driver fsi_soc_component = {
		.name = "fsi",
		.ops = &fsi_pcm_ops,
		.pcm_new = fsi_pcm_new,
		};

		/*
		@@ -2007,23 +2004,15 @@ static int fsi_probe(struct platform_device *pdev)
		goto exit_fsib;
		}

		ret = snd_soc_register_platform(&pdev->dev, &fsi_soc_platform);
		if (ret < 0) {
		dev_err(&pdev->dev, "cannot snd soc register\n");
		goto exit_fsib;
		}

		ret = snd_soc_register_component(&pdev->dev, &fsi_soc_component,
		ret = devm_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 component register\n");
		goto exit_snd_soc;
		goto exit_fsib;
		}

		return ret;

		exit_snd_soc:
		snd_soc_unregister_platform(&pdev->dev);
		exit_fsib:
		pm_runtime_disable(&pdev->dev);
		fsi_stream_remove(&master->fsib);
		@@ -2041,9 +2030,6 @@ static int fsi_remove(struct platform_device *pdev)

		pm_runtime_disable(&pdev->dev);

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

		fsi_stream_remove(&master->fsia);
		fsi_stream_remove(&master->fsib);