Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0ac223a4 authored by Wolfram Sang's avatar Wolfram Sang Committed by Ulf Hansson
Browse files

mmc: mvsdio: don't use devm_pinctrl_get_select_default() in probe 



Since commit ab78029e (drivers/pinctrl: grab default handles from device
core), we can rely on device core for setting the default pins.

Signed-off-by: default avatarWolfram Sang <wsa@the-dreams.de>
Signed-off-by: default avatarUlf Hansson <ulf.hansson@linaro.org>
parent bf3707ea

drivers/mmc/host/mvsdio.c

+0 −6
Original line number Diff line number Diff line
@@ -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,