Commit 475d9e3e authored by Russell King's avatar Russell King Committed by Chris Ball
Browse files

mmc: sdhci-spear: simplify resource handling 



Use devm_ioremap_resource() to simplify iomem resource handling in the
probe path.

Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
Signed-off-by: default avatarChris Ball <chris@printf.net>
parent fcdb7c8f

drivers/mmc/host/sdhci-spear.c

+13 −27
Original line number Diff line number Diff line
@@ -108,20 +108,6 @@ static int sdhci_probe(struct platform_device *pdev) 
	struct device *dev;

	int ret;



	iomem = platform_get_resource(pdev, IORESOURCE_MEM, 0);

	if (!iomem) {

		ret = -ENOMEM;

		dev_dbg(&pdev->dev, "memory resource not defined\n");

		goto err;

	}



	if (!devm_request_mem_region(&pdev->dev, iomem->start,

				resource_size(iomem), "spear-sdhci")) {

		ret = -EBUSY;

		dev_dbg(&pdev->dev, "cannot request region\n");

		goto err;

	}



	dev = pdev->dev.parent ? pdev->dev.parent : &pdev->dev;

	host = sdhci_alloc_host(dev, sizeof(*sdhci));

	if (IS_ERR(host)) {
@@ -130,6 +116,19 @@ static int sdhci_probe(struct platform_device *pdev) 
		goto err;

	}



	iomem = platform_get_resource(pdev, IORESOURCE_MEM, 0);

	host->ioaddr = devm_ioremap_resource(&pdev->dev, iomem);

	if (IS_ERR(host->ioaddr)) {

		ret = PTR_ERR(host->ioaddr);

		dev_dbg(&pdev->dev, "unable to map iomem: %d\n", ret);

		goto err_host;

	}



	host->hw_name = "sdhci";

	host->ops = &sdhci_pltfm_ops;

	host->irq = platform_get_irq(pdev, 0);

	host->quirks = SDHCI_QUIRK_BROKEN_ADMA;



	sdhci = sdhci_priv(host);



	/* clk enable */
@@ -161,19 +160,6 @@ static int sdhci_probe(struct platform_device *pdev) 
		sdhci->data = dev_get_platdata(&pdev->dev);

	}



	host->hw_name = "sdhci";

	host->ops = &sdhci_pltfm_ops;

	host->irq = platform_get_irq(pdev, 0);

	host->quirks = SDHCI_QUIRK_BROKEN_ADMA;



	host->ioaddr = devm_ioremap(&pdev->dev, iomem->start,

			resource_size(iomem));

	if (!host->ioaddr) {

		ret = -ENOMEM;

		dev_dbg(&pdev->dev, "failed to remap registers\n");

		goto disable_clk;

	}



	ret = sdhci_add_host(host);

	if (ret) {

		dev_dbg(&pdev->dev, "error adding host\n");