Unverified Commit fcc5b37c authored by Mark Brown's avatar Mark Brown
Browse files

ASoC: atmel: one fix and few cleanups 

Merge series from Claudiu Beznea <claudiu.beznea@microchip.com>:

The series adds one fix for mchp-spdifrx and few cleanups for
mchp-spdifrx and mchp-spdifrx drivers.
parents d8167741 96f6017d

sound/soc/atmel/mchp-spdiftx.c

+5 −9
Original line number Diff line number Diff line
@@ -341,12 +341,10 @@ static int mchp_spdiftx_trigger(struct snd_pcm_substream *substream, int cmd, 


	ret = regmap_write(dev->regmap, SPDIFTX_MR, mr);

	spin_unlock(&ctrl->lock);

	if (ret) {

	if (ret)

		dev_err(dev->dev, "unable to disable TX: %d\n", ret);

		return ret;

	}



	return 0;

	return ret;

}



static int mchp_spdiftx_hw_params(struct snd_pcm_substream *substream,
@@ -763,8 +761,8 @@ static const struct of_device_id mchp_spdiftx_dt_ids[] = { 
	},

	{ /* sentinel */ }

};



MODULE_DEVICE_TABLE(of, mchp_spdiftx_dt_ids);



static int mchp_spdiftx_probe(struct platform_device *pdev)

{

	struct device_node *np = pdev->dev.of_node;
@@ -848,12 +846,10 @@ static int mchp_spdiftx_probe(struct platform_device *pdev) 
	err = devm_snd_soc_register_component(&pdev->dev,

					      &mchp_spdiftx_component,

					      &mchp_spdiftx_dai, 1);

	if (err) {

	if (err)

		dev_err(&pdev->dev, "failed to register component: %d\n", err);

		return err;

	}



	return 0;

	return err;

}



static struct platform_driver mchp_spdiftx_driver = {

sound/soc/atmel/mchp-spdifrx.c

+5 −5

File changed.

Contains only whitespace changes.