| Message ID | 1419286616-9893-2-git-send-email-wsa@the-dreams.de (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On 22 December 2014 at 23:16, Wolfram Sang <wsa@the-dreams.de> wrote: > 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> Thanks! Applied for next, with an updated prefix of the commit header to "mmc: mvsdio:". Kind regards Uffe > --- > drivers/mmc/host/mvsdio.c | 6 ------ > 1 file changed, 6 deletions(-) > > diff --git a/drivers/mmc/host/mvsdio.c b/drivers/mmc/host/mvsdio.c > index 4f8618f4522d..a2cb92851f1f 100644 > --- a/drivers/mmc/host/mvsdio.c > +++ b/drivers/mmc/host/mvsdio.c > @@ -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, > -- > 2.1.3 > -- To unsubscribe from this list: send the line "unsubscribe linux-mmc" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/mmc/host/mvsdio.c b/drivers/mmc/host/mvsdio.c index 4f8618f4522d..a2cb92851f1f 100644 --- a/drivers/mmc/host/mvsdio.c +++ b/drivers/mmc/host/mvsdio.c @@ -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,
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> --- drivers/mmc/host/mvsdio.c | 6 ------ 1 file changed, 6 deletions(-)