diff options
author | Fabio Estevam <fabio.estevam@freescale.com> | 2013-06-27 10:49:16 -0400 |
---|---|---|
committer | Chris Ball <cjb@laptop.org> | 2013-06-27 10:49:16 -0400 |
commit | dcac5fe3cfad106ba5369bc0f6bbcf111e21ddc6 (patch) | |
tree | 72a967d6fa913fe57541eed1749ab3300c540c44 /drivers/mmc | |
parent | 6636bad839d9936e73e48c4841eda83a58fcdb53 (diff) |
mmc: mxs-mmc: Let device core handle pinctrl
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>
Diffstat (limited to 'drivers/mmc')
-rw-r--r-- | drivers/mmc/host/mxs-mmc.c | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/drivers/mmc/host/mxs-mmc.c b/drivers/mmc/host/mxs-mmc.c index c26280469b05..f38d75f46f78 100644 --- a/drivers/mmc/host/mxs-mmc.c +++ b/drivers/mmc/host/mxs-mmc.c | |||
@@ -41,7 +41,6 @@ | |||
41 | #include <linux/gpio.h> | 41 | #include <linux/gpio.h> |
42 | #include <linux/regulator/consumer.h> | 42 | #include <linux/regulator/consumer.h> |
43 | #include <linux/module.h> | 43 | #include <linux/module.h> |
44 | #include <linux/pinctrl/consumer.h> | ||
45 | #include <linux/stmp_device.h> | 44 | #include <linux/stmp_device.h> |
46 | #include <linux/spi/mxs-spi.h> | 45 | #include <linux/spi/mxs-spi.h> |
47 | 46 | ||
@@ -580,7 +579,6 @@ static int mxs_mmc_probe(struct platform_device *pdev) | |||
580 | struct mxs_mmc_host *host; | 579 | struct mxs_mmc_host *host; |
581 | struct mmc_host *mmc; | 580 | struct mmc_host *mmc; |
582 | struct resource *iores; | 581 | struct resource *iores; |
583 | struct pinctrl *pinctrl; | ||
584 | int ret = 0, irq_err; | 582 | int ret = 0, irq_err; |
585 | struct regulator *reg_vmmc; | 583 | struct regulator *reg_vmmc; |
586 | enum of_gpio_flags flags; | 584 | enum of_gpio_flags flags; |
@@ -620,12 +618,6 @@ static int mxs_mmc_probe(struct platform_device *pdev) | |||
620 | } | 618 | } |
621 | } | 619 | } |
622 | 620 | ||
623 | pinctrl = devm_pinctrl_get_select_default(&pdev->dev); | ||
624 | if (IS_ERR(pinctrl)) { | ||
625 | ret = PTR_ERR(pinctrl); | ||
626 | goto out_mmc_free; | ||
627 | } | ||
628 | |||
629 | ssp->clk = clk_get(&pdev->dev, NULL); | 621 | ssp->clk = clk_get(&pdev->dev, NULL); |
630 | if (IS_ERR(ssp->clk)) { | 622 | if (IS_ERR(ssp->clk)) { |
631 | ret = PTR_ERR(ssp->clk); | 623 | ret = PTR_ERR(ssp->clk); |