Skip to contentSkip to conversation

ASoC: fsl: imx-audmux: Let device core handle pinctrl

PATCH In review Fabio Estevam 2 participants 2 messages May 6, 2013

Subsystems (4)
lore
Share & tools
lore

Fabio Estevam

author reviewer
#0 lore raw

PATCH v2 12/13 ASoC: fsl: imx-audmux: Let device core handle pinctrl

From: Fabio Estevam <[email protected]>

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.

---
Changes since v1:
- Rebased against topic/fsl branch

 sound/soc/fsl/imx-audmux.c |    8 --------
 1 file changed, 8 deletions(-)
sound/soc/fsl/imx-audmux.c +0 -8
index 47f046a..e260f1f 100644
@@ -26,7 +26,6 @@
 #include <linux/of_device.h>
 #include <linux/platform_device.h>
 #include <linux/slab.h>
-#include <linux/pinctrl/consumer.h>
 
 #include "imx-audmux.h"
 
@@ -247,7 +246,6 @@ EXPORT_SYMBOL_GPL(imx_audmux_v2_configure_port);
 static int imx_audmux_probe(struct platform_device *pdev)
 {
 	struct resource *res;
-	struct pinctrl *pinctrl;
 	const struct of_device_id *of_id =
 			of_match_device(imx_audmux_dt_ids, &pdev->dev);
 
@@ -256,12 +254,6 @@ static int imx_audmux_probe(struct platform_device *pdev)
 	if (IS_ERR(audmux_base))
 		return PTR_ERR(audmux_base);
 
-	pinctrl = devm_pinctrl_get_select_default(&pdev->dev);
-	if (IS_ERR(pinctrl)) {
-		dev_err(&pdev->dev, "setup pinctrl failed!");
-		return PTR_ERR(pinctrl);
-	}
-
 	audmux_clk = devm_clk_get(&pdev->dev, "audmux");
 	if (IS_ERR(audmux_clk)) {
 		dev_dbg(&pdev->dev, "cannot get clock: %ld\n",
Signature · 1 line
1.7.9.5
maintainer
#1 lore raw
Quoted 4 lines · Fabio Estevam

From: Fabio Estevam <[email protected]>

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

Applied. Please do remember that patch series numbers should only be used when actually posting a patch series, they only serve to order within the series. Adding them at other times makes it look like there's some dependencies that have been delayed.