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

Commit c2e67550 authored by Yangtao Li's avatar Yangtao Li Committed by Greg Kroah-Hartman
Browse files

mmc: mvsdio: convert to devm_platform_ioremap_resource 



[ Upstream commit 0a337eb168d6cbb85f6b4eb56d1be55e24c80452 ]

Use devm_platform_ioremap_resource() to simplify code.

Signed-off-by: default avatarYangtao Li <tiny.windzz@gmail.com>
Link: https://lore.kernel.org/r/20191215175120.3290-11-tiny.windzz@gmail.com


Signed-off-by: default avatarUlf Hansson <ulf.hansson@linaro.org>
Stable-dep-of: 8d84064da0d4 ("mmc: mvsdio: fix deferred probing")
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 3ef787d6

drivers/mmc/host/mvsdio.c

+2 −4
Original line number Diff line number Diff line
@@ -696,16 +696,14 @@ static int mvsd_probe(struct platform_device *pdev) 
	struct mmc_host *mmc = NULL;

	struct mvsd_host *host = NULL;

	const struct mbus_dram_target_info *dram;

	struct resource *r;

	int ret, irq;



	if (!np) {

		dev_err(&pdev->dev, "no DT node\n");

		return -ENODEV;

	}

	r = platform_get_resource(pdev, IORESOURCE_MEM, 0);

	irq = platform_get_irq(pdev, 0);

	if (!r || irq < 0)

	if (irq < 0)

		return -ENXIO;



	mmc = mmc_alloc_host(sizeof(struct mvsd_host), &pdev->dev);
@@ -758,7 +756,7 @@ static int mvsd_probe(struct platform_device *pdev) 


	spin_lock_init(&host->lock);



	host->base = devm_ioremap_resource(&pdev->dev, r);

	host->base = devm_platform_ioremap_resource(pdev, 0);

	if (IS_ERR(host->base)) {

		ret = PTR_ERR(host->base);

		goto out;