|
@@ -152,19 +152,9 @@ struct sdhci_host *sdhci_pltfm_init(struct platform_device *pdev,
|
|
|
goto err_request;
|
|
goto err_request;
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
- if (!devm_request_mem_region(&pdev->dev, iomem->start,
|
|
|
|
|
- resource_size(iomem),
|
|
|
|
|
- mmc_hostname(host->mmc))) {
|
|
|
|
|
- dev_err(&pdev->dev, "cannot request region\n");
|
|
|
|
|
- ret = -EBUSY;
|
|
|
|
|
- goto err_request;
|
|
|
|
|
- }
|
|
|
|
|
-
|
|
|
|
|
- host->ioaddr = devm_ioremap(&pdev->dev, iomem->start,
|
|
|
|
|
- resource_size(iomem));
|
|
|
|
|
- if (!host->ioaddr) {
|
|
|
|
|
- dev_err(&pdev->dev, "failed to remap registers\n");
|
|
|
|
|
- ret = -ENOMEM;
|
|
|
|
|
|
|
+ host->ioaddr = devm_ioremap_resource(&pdev->dev, iomem);
|
|
|
|
|
+ if (IS_ERR(host->ioaddr)) {
|
|
|
|
|
+ ret = PTR_ERR(host->ioaddr);
|
|
|
goto err_request;
|
|
goto err_request;
|
|
|
}
|
|
}
|
|
|
|
|
|