mmc: mvsdio: don't use devm_pinctrl_get_select_default() in probe
authorWolfram Sang <wsa@the-dreams.de>
Mon, 22 Dec 2014 22:16:54 +0000 (23:16 +0100)
committerUlf Hansson <ulf.hansson@linaro.org>
Mon, 19 Jan 2015 08:56:21 +0000 (09:56 +0100)
Since commit ab78029ecc34 (drivers/pinctrl: grab default handles from device
core), we can rely on device core for setting the default pins.

Signed-off-by: Wolfram Sang <wsa@the-dreams.de>
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
drivers/mmc/host/mvsdio.c

index b6ec91fb2fd58256ebfac9cdbfdee7cfbbfc53b5..a448498e3af2fc3ce0b173dc404fe7ccefcee0d1 100644 (file)
@@ -25,7 +25,6 @@
 #include <linux/of_irq.h>
 #include <linux/mmc/host.h>
 #include <linux/mmc/slot-gpio.h>
-#include <linux/pinctrl/consumer.h>
 
 #include <asm/sizes.h>
 #include <asm/unaligned.h>
@@ -704,7 +703,6 @@ static int mvsd_probe(struct platform_device *pdev)
        const struct mbus_dram_target_info *dram;
        struct resource *r;
        int ret, irq;
-       struct pinctrl *pinctrl;
 
        r = platform_get_resource(pdev, IORESOURCE_MEM, 0);
        irq = platform_get_irq(pdev, 0);
@@ -721,10 +719,6 @@ static int mvsd_probe(struct platform_device *pdev)
        host->mmc = mmc;
        host->dev = &pdev->dev;
 
-       pinctrl = devm_pinctrl_get_select_default(&pdev->dev);
-       if (IS_ERR(pinctrl))
-               dev_warn(&pdev->dev, "no pins associated\n");
-
        /*
         * Some non-DT platforms do not pass a clock, and the clock
         * frequency is passed through platform_data. On DT platforms,