]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
mmc: mxs-mmc: Let device core handle pinctrl
authorFabio Estevam <fabio.estevam@freescale.com>
Thu, 27 Jun 2013 14:49:16 +0000 (10:49 -0400)
committerChris Ball <cjb@laptop.org>
Thu, 27 Jun 2013 14:49:16 +0000 (10:49 -0400)
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: Fabio Estevam <fabio.estevam@freescale.com>
Signed-off-by: Chris Ball <cjb@laptop.org>
drivers/mmc/host/mxs-mmc.c

index c26280469b05004bb1e2f2bf8db7b4daa08ef5b4..f38d75f46f7806a5633fe91860a68e645dca0201 100644 (file)
@@ -41,7 +41,6 @@
 #include <linux/gpio.h>
 #include <linux/regulator/consumer.h>
 #include <linux/module.h>
-#include <linux/pinctrl/consumer.h>
 #include <linux/stmp_device.h>
 #include <linux/spi/mxs-spi.h>
 
@@ -580,7 +579,6 @@ static int mxs_mmc_probe(struct platform_device *pdev)
        struct mxs_mmc_host *host;
        struct mmc_host *mmc;
        struct resource *iores;
-       struct pinctrl *pinctrl;
        int ret = 0, irq_err;
        struct regulator *reg_vmmc;
        enum of_gpio_flags flags;
@@ -620,12 +618,6 @@ static int mxs_mmc_probe(struct platform_device *pdev)
                }
        }
 
-       pinctrl = devm_pinctrl_get_select_default(&pdev->dev);
-       if (IS_ERR(pinctrl)) {
-               ret = PTR_ERR(pinctrl);
-               goto out_mmc_free;
-       }
-
        ssp->clk = clk_get(&pdev->dev, NULL);
        if (IS_ERR(ssp->clk)) {
                ret = PTR_ERR(ssp->clk);