mmc: sdhci-sirf: let device core setup the default pin configuration

With device core now able to setup the default pin configuration, the
call to devm_pinctrl_get_select_default can be removed. And the pin
configuration code based on the deprecated Samsung specific gpio
bindings is also removed.

Acked-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Barry Song <Baohua.Song@csr.com>
Signed-off-by: Chris Ball <cjb@laptop.org>

diff --git a/drivers/mmc/host/sdhci-sirf.c b/drivers/mmc/host/sdhci-sirf.c
index 09805af..ccf12dd 100644 (file)
--- a/drivers/mmc/host/sdhci-sirf.c
+++ b/drivers/mmc/host/sdhci-sirf.c
@@ -13,7 +13,6 @@
 #include <linux/of.h>
 #include <linux/of_gpio.h>
 #include <linux/mmc/slot-gpio.h>
 #include <linux/of.h>
 #include <linux/of_gpio.h>
 #include <linux/mmc/slot-gpio.h>

-#include <linux/pinctrl/consumer.h>

 #include "sdhci-pltfm.h"
 
 struct sdhci_sirf_priv {
 #include "sdhci-pltfm.h"
 
 struct sdhci_sirf_priv {


@@ -46,15 +45,8 @@ static int sdhci_sirf_probe(struct platform_device *pdev)
        struct sdhci_host *host;
        struct sdhci_pltfm_host *pltfm_host;
        struct sdhci_sirf_priv *priv;
        struct sdhci_host *host;
        struct sdhci_pltfm_host *pltfm_host;
        struct sdhci_sirf_priv *priv;

-       struct pinctrl *pinctrl;

        int ret;
 
        int ret;
 

-       pinctrl = devm_pinctrl_get_select_default(&pdev->dev);
-       if (IS_ERR(pinctrl)) {
-               dev_err(&pdev->dev, "unable to get pinmux");
-               return PTR_ERR(pinctrl);
-       }
-

        priv = devm_kzalloc(&pdev->dev, sizeof(struct sdhci_sirf_priv),
                GFP_KERNEL);
        if (!priv) {
        priv = devm_kzalloc(&pdev->dev, sizeof(struct sdhci_sirf_priv),
                GFP_KERNEL);
        if (!priv) {