Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Unverified Commit 80f23c29 authored by Kuninori Morimoto's avatar Kuninori Morimoto Committed by Mark Brown
Browse files

ASoC: xtfpga-i2s: replace platform to component 



Now platform can be replaced to component, let's do it.

Signed-off-by: default avatarKuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 17d619da

sound/soc/xtensa/xtfpga-i2s.c

+3 −14
Original line number Original line Diff line number Diff line
@@ -483,13 +483,10 @@ static const struct snd_pcm_ops xtfpga_pcm_ops = { 
	.pointer	= xtfpga_pcm_pointer,

	.pointer	= xtfpga_pcm_pointer,

};

};





static const struct snd_soc_platform_driver xtfpga_soc_platform = {

	.pcm_new	= xtfpga_pcm_new,

	.ops		= &xtfpga_pcm_ops,

};



static const struct snd_soc_component_driver xtfpga_i2s_component = {

static const struct snd_soc_component_driver xtfpga_i2s_component = {

	.name		= DRV_NAME,

	.name		= DRV_NAME,

	.pcm_new	= xtfpga_pcm_new,

	.ops		= &xtfpga_pcm_ops,

};

};





static const struct snd_soc_dai_ops xtfpga_i2s_dai_ops = {

static const struct snd_soc_dai_ops xtfpga_i2s_dai_ops = {
@@ -591,18 +588,13 @@ static int xtfpga_i2s_probe(struct platform_device *pdev) 
		goto err;

		goto err;

	}

	}





	err = snd_soc_register_platform(&pdev->dev, &xtfpga_soc_platform);

	if (err < 0) {

		dev_err(&pdev->dev, "couldn't register platform\n");

		goto err;

	}

	err = devm_snd_soc_register_component(&pdev->dev,

	err = devm_snd_soc_register_component(&pdev->dev,

					      &xtfpga_i2s_component,

					      &xtfpga_i2s_component,

					      xtfpga_i2s_dai,

					      xtfpga_i2s_dai,

					      ARRAY_SIZE(xtfpga_i2s_dai));

					      ARRAY_SIZE(xtfpga_i2s_dai));

	if (err < 0) {

	if (err < 0) {

		dev_err(&pdev->dev, "couldn't register component\n");

		dev_err(&pdev->dev, "couldn't register component\n");

		goto err_unregister_platform;

		goto err;

	}

	}





	pm_runtime_enable(&pdev->dev);

	pm_runtime_enable(&pdev->dev);
@@ -615,8 +607,6 @@ static int xtfpga_i2s_probe(struct platform_device *pdev) 




err_pm_disable:

err_pm_disable:

	pm_runtime_disable(&pdev->dev);

	pm_runtime_disable(&pdev->dev);

err_unregister_platform:

	snd_soc_unregister_platform(&pdev->dev);

err:

err:

	dev_err(&pdev->dev, "%s: err = %d\n", __func__, err);

	dev_err(&pdev->dev, "%s: err = %d\n", __func__, err);

	return err;

	return err;
@@ -626,7 +616,6 @@ static int xtfpga_i2s_remove(struct platform_device *pdev) 
{

{

	struct xtfpga_i2s *i2s = dev_get_drvdata(&pdev->dev);

	struct xtfpga_i2s *i2s = dev_get_drvdata(&pdev->dev);





	snd_soc_unregister_platform(&pdev->dev);

	if (i2s->regmap && !IS_ERR(i2s->regmap)) {

	if (i2s->regmap && !IS_ERR(i2s->regmap)) {

		regmap_write(i2s->regmap, XTFPGA_I2S_CONFIG, 0);

		regmap_write(i2s->regmap, XTFPGA_I2S_CONFIG, 0);

		regmap_write(i2s->regmap, XTFPGA_I2S_INT_MASK, 0);

		regmap_write(i2s->regmap, XTFPGA_I2S_INT_MASK, 0);