Skip to content

Commit

Permalink
ASoC: sam9g20ek: Let device core handle pinctrl
Browse files Browse the repository at this point in the history
Since commit ab78029 (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: Mark Brown <broonie@opensource.wolfsonmicro.com>
Tested-by: Bo Shen <voice.shen@atmel.com>
Acked-by: Bo Shen <voice.shen@atmel.com>
  • Loading branch information
Mark Brown committed May 12, 2013
1 parent f722406 commit 9b74fad
Showing 1 changed file with 0 additions and 9 deletions.
9 changes: 0 additions & 9 deletions sound/soc/atmel/sam9g20_wm8731.c
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,6 @@
#include <linux/platform_device.h>
#include <linux/i2c.h>

#include <linux/pinctrl/consumer.h>

#include <linux/atmel-ssc.h>

#include <sound/core.h>
Expand Down Expand Up @@ -203,15 +201,8 @@ static int at91sam9g20ek_audio_probe(struct platform_device *pdev)
struct device_node *codec_np, *cpu_np;
struct clk *pllb;
struct snd_soc_card *card = &snd_soc_at91sam9g20ek;
struct pinctrl *pinctrl;
int ret;

pinctrl = devm_pinctrl_get_select_default(&pdev->dev);
if (IS_ERR(pinctrl)) {
dev_err(&pdev->dev, "Failed to request pinctrl for mck\n");
return PTR_ERR(pinctrl);
}

if (!np) {
if (!(machine_is_at91sam9g20ek() ||
machine_is_at91sam9g20ek_2mmc()))
Expand Down

0 comments on commit 9b74fad

Please sign in to comment.