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

Commit e76af6d1 authored by Fabio Estevam's avatar Fabio Estevam Committed by Mark Brown
Browse files

ASoC: mxs: mxs-saif: Let device core handle pinctrl 



Since commit ab78029e (drivers/pinctrl: grab default handles from device core),
we can rely on device core for handling pinctrl.

So remove devm_pinctrl_get_select_default() from the driver.

Signed-off-by: default avatarFabio Estevam <fabio.estevam@freescale.com>
Signed-off-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
parent f722406f

sound/soc/mxs/mxs-saif.c

+0 −8
Original line number Diff line number Diff line
@@ -27,7 +27,6 @@ 
#include <linux/delay.h>

#include <linux/time.h>

#include <linux/fsl/mxs-dma.h>

#include <linux/pinctrl/consumer.h>

#include <sound/core.h>

#include <sound/pcm.h>

#include <sound/pcm_params.h>
@@ -667,7 +666,6 @@ static int mxs_saif_probe(struct platform_device *pdev) 
	struct device_node *np = pdev->dev.of_node;

	struct resource *iores, *dmares;

	struct mxs_saif *saif;

	struct pinctrl *pinctrl;

	int ret = 0;

	struct device_node *master;
@@ -707,12 +705,6 @@ static int mxs_saif_probe(struct platform_device *pdev) 


	mxs_saif[saif->id] = saif;



	pinctrl = devm_pinctrl_get_select_default(&pdev->dev);

	if (IS_ERR(pinctrl)) {

		ret = PTR_ERR(pinctrl);

		return ret;

	}



	saif->clk = devm_clk_get(&pdev->dev, NULL);

	if (IS_ERR(saif->clk)) {

		ret = PTR_ERR(saif->clk);