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

Commit 48afa793 authored by Wolfram Sang's avatar Wolfram Sang Committed by Mark Brown
Browse files

ASoC: atmel: don't use devm_pinctrl_get_select_default() in probe 



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

Signed-off-by: default avatarWolfram Sang <wsa@the-dreams.de>
Acked-by: Linus Walleij <linus.walleij@linaro.org> (personally at LCE13)
Acked-by: default avatarBo Shen <voice.shen@atmel.com>
Signed-off-by: default avatarMark Brown <broonie@linaro.org>
parent 3a429eea

sound/soc/atmel/atmel_wm8904.c

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

#include <linux/of.h>

#include <linux/of_device.h>

#include <linux/pinctrl/consumer.h>



#include <sound/soc.h>
@@ -155,15 +154,8 @@ static int atmel_asoc_wm8904_probe(struct platform_device *pdev) 
	struct snd_soc_card *card = &atmel_asoc_wm8904_card;

	struct snd_soc_dai_link *dailink = &atmel_asoc_wm8904_dailink;

	struct clk *clk_src;

	struct pinctrl *pinctrl;

	int id, ret;



	pinctrl = devm_pinctrl_get_select_default(&pdev->dev);

	if (IS_ERR(pinctrl)) {

		dev_err(&pdev->dev, "failed to request pinctrl\n");

		return PTR_ERR(pinctrl);

	}



	card->dev = &pdev->dev;

	ret = atmel_asoc_wm8904_dt_init(pdev);

	if (ret) {