From 7ce85cce3725f31dda75a7a73709a0e06451bccb Mon Sep 17 00:00:00 2001
From: Sylwester Nawrocki <s.nawrocki@samsung.com>
Date: Thu, 17 Apr 2014 20:50:21 +0200
Subject: Revert "ASoC: samsung: Add pinctrl support to I2S driver"

This reverts commit 2b0c7de1eaf0e25c69ed1e4b21675ab97c6a4bdf,
which is not needed since pinctrl is handled by the driver core.

Change-Id: I0f204f15a39e07083375067fc828cf46bdb78360
Signed-off-by: Sylwester Nawrocki <s.nawrocki@samsung.com>
---
 sound/soc/samsung/i2s.c | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/sound/soc/samsung/i2s.c b/sound/soc/samsung/i2s.c
index 31936ac089d..9aa1628ca37 100644
--- a/sound/soc/samsung/i2s.c
+++ b/sound/soc/samsung/i2s.c
@@ -17,7 +17,6 @@
 #include <linux/module.h>
 #include <linux/of.h>
 #include <linux/of_gpio.h>
-#include <linux/pinctrl/consumer.h>
 #include <linux/pm_runtime.h>
 
 #include <sound/soc.h>
@@ -1329,10 +1328,7 @@ static int samsung_i2s_probe(struct platform_device *pdev)
 	}
 
 	if (np) {
-		struct pinctrl *pctrl;
-		pctrl = devm_pinctrl_get_select_default(&pdev->dev);
-
-		if (IS_ERR(pctrl) && samsung_i2s_parse_dt_gpio(pri_dai)) {
+		if (samsung_i2s_parse_dt_gpio(pri_dai)) {
 			dev_err(&pdev->dev, "Unable to configure gpio\n");
 			ret = -EINVAL;
 			goto err;
-- 
cgit v1.2.3