lkml.org 
[lkml]   [2013]   [Oct]   [14]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
From
SubjectRe: [PATCH 2/4] drivers/mmc/host: don't use devm_pinctrl_get_select_default() in probe
Date
On 2013-10-13, Wolfram Sang <wsa@the-dreams.de> wrote:
> Since commit ab78029 (drivers/pinctrl: grab default handles from device core),
> we can rely on device core for setting the default pins. Compile tested only.
>
> Acked-by: Linus Walleij <linus.walleij@linaro.org> (personally at LCE13)
> Signed-off-by: Wolfram Sang <wsa@the-dreams.de>
> ---
> drivers/mmc/host/mvsdio.c | 7 +------
> drivers/mmc/host/omap_hsmmc.c | 7 -------
> drivers/mmc/host/sdhci-esdhc-imx.c | 8 --------
> 3 files changed, 1 insertion(+), 21 deletions(-)
>
> diff --git a/drivers/mmc/host/mvsdio.c b/drivers/mmc/host/mvsdio.c
> index 06c5b0b..8c9f448 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>
> @@ -685,7 +684,7 @@ static int __init mvsd_probe(struct platform_device *pdev)
> const struct mbus_dram_target_info *dram;
> struct resource *r;
> int ret, irq;
> - struct pinctrl *pinctrl;
> + int gpio_card_detect, gpio_write_protect;
>

This new line does not belong to this patch.

> r = platform_get_resource(pdev, IORESOURCE_MEM, 0);
> irq = platform_get_irq(pdev, 0);
> @@ -702,10 +701,6 @@ static int __init 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,

Best regards,
--
Romain Izard



\
 
 \ /
  Last update: 2013-10-14 09:41    [W:0.081 / U:0.868 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site