mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-12 21:57:43 +00:00
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>
This commit is contained in:
parent
6636bad839
commit
dcac5fe3cf
1 changed files with 0 additions and 8 deletions
|
@ -41,7 +41,6 @@
|
||||||
#include <linux/gpio.h>
|
#include <linux/gpio.h>
|
||||||
#include <linux/regulator/consumer.h>
|
#include <linux/regulator/consumer.h>
|
||||||
#include <linux/module.h>
|
#include <linux/module.h>
|
||||||
#include <linux/pinctrl/consumer.h>
|
|
||||||
#include <linux/stmp_device.h>
|
#include <linux/stmp_device.h>
|
||||||
#include <linux/spi/mxs-spi.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 mxs_mmc_host *host;
|
||||||
struct mmc_host *mmc;
|
struct mmc_host *mmc;
|
||||||
struct resource *iores;
|
struct resource *iores;
|
||||||
struct pinctrl *pinctrl;
|
|
||||||
int ret = 0, irq_err;
|
int ret = 0, irq_err;
|
||||||
struct regulator *reg_vmmc;
|
struct regulator *reg_vmmc;
|
||||||
enum of_gpio_flags flags;
|
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);
|
ssp->clk = clk_get(&pdev->dev, NULL);
|
||||||
if (IS_ERR(ssp->clk)) {
|
if (IS_ERR(ssp->clk)) {
|
||||||
ret = PTR_ERR(ssp->clk);
|
ret = PTR_ERR(ssp->clk);
|
||||||
|
|
Loading…
Reference in a new issue