diff options
author | Wolfram Sang <wsa@the-dreams.de> | 2014-12-22 17:16:54 -0500 |
---|---|---|
committer | Ulf Hansson <ulf.hansson@linaro.org> | 2015-01-19 03:56:21 -0500 |
commit | 0ac223a43913b0d2d73faa58cf0b2744ca33ef9c (patch) | |
tree | 89bd3f864c9cd381dbeadc148695715970d38f55 /drivers/mmc/host/mvsdio.c | |
parent | bf3707eae666c1f9de23d258e51a8d4b91f29e43 (diff) |
mmc: mvsdio: don't use devm_pinctrl_get_select_default() in probe
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>
Diffstat (limited to 'drivers/mmc/host/mvsdio.c')
-rw-r--r-- | drivers/mmc/host/mvsdio.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/drivers/mmc/host/mvsdio.c b/drivers/mmc/host/mvsdio.c index b6ec91fb2fd5..a448498e3af2 100644 --- a/drivers/mmc/host/mvsdio.c +++ b/drivers/mmc/host/mvsdio.c | |||
@@ -25,7 +25,6 @@ | |||
25 | #include <linux/of_irq.h> | 25 | #include <linux/of_irq.h> |
26 | #include <linux/mmc/host.h> | 26 | #include <linux/mmc/host.h> |
27 | #include <linux/mmc/slot-gpio.h> | 27 | #include <linux/mmc/slot-gpio.h> |
28 | #include <linux/pinctrl/consumer.h> | ||
29 | 28 | ||
30 | #include <asm/sizes.h> | 29 | #include <asm/sizes.h> |
31 | #include <asm/unaligned.h> | 30 | #include <asm/unaligned.h> |
@@ -704,7 +703,6 @@ static int mvsd_probe(struct platform_device *pdev) | |||
704 | const struct mbus_dram_target_info *dram; | 703 | const struct mbus_dram_target_info *dram; |
705 | struct resource *r; | 704 | struct resource *r; |
706 | int ret, irq; | 705 | int ret, irq; |
707 | struct pinctrl *pinctrl; | ||
708 | 706 | ||
709 | r = platform_get_resource(pdev, IORESOURCE_MEM, 0); | 707 | r = platform_get_resource(pdev, IORESOURCE_MEM, 0); |
710 | irq = platform_get_irq(pdev, 0); | 708 | irq = platform_get_irq(pdev, 0); |
@@ -721,10 +719,6 @@ static int mvsd_probe(struct platform_device *pdev) | |||
721 | host->mmc = mmc; | 719 | host->mmc = mmc; |
722 | host->dev = &pdev->dev; | 720 | host->dev = &pdev->dev; |
723 | 721 | ||
724 | pinctrl = devm_pinctrl_get_select_default(&pdev->dev); | ||
725 | if (IS_ERR(pinctrl)) | ||
726 | dev_warn(&pdev->dev, "no pins associated\n"); | ||
727 | |||
728 | /* | 722 | /* |
729 | * Some non-DT platforms do not pass a clock, and the clock | 723 | * Some non-DT platforms do not pass a clock, and the clock |
730 | * frequency is passed through platform_data. On DT platforms, | 724 | * frequency is passed through platform_data. On DT platforms, |