Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1383000
| From | Masahiro Yamada <yamada.masahiro@socionext.com> |
|---|---|
| Newsgroups | linux.kernel |
| Subject | [PATCH v2 3/7] mmc: sdhci-pltfm: use devm_request_mem_region() |
| Date | 2016-04-20 04:20 +0200 |
| Message-ID | <rpPUe-oM-7@gated-at.bofh.it> (permalink) |
| References | <rpPUe-oM-1@gated-at.bofh.it> |
| Organization | linux.* mail to news gateway |
Use the managed variant of request_mem_region().
Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
---
Changes in v2: None
drivers/mmc/host/sdhci-pltfm.c | 11 ++++-------
1 file changed, 4 insertions(+), 7 deletions(-)
diff --git a/drivers/mmc/host/sdhci-pltfm.c b/drivers/mmc/host/sdhci-pltfm.c
index 24377a3..8527a7c 100644
--- a/drivers/mmc/host/sdhci-pltfm.c
+++ b/drivers/mmc/host/sdhci-pltfm.c
@@ -152,8 +152,9 @@ struct sdhci_host *sdhci_pltfm_init(struct platform_device *pdev,
goto err_request;
}
- if (!request_mem_region(iomem->start, resource_size(iomem),
- mmc_hostname(host->mmc))) {
+ 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;
@@ -163,7 +164,7 @@ struct sdhci_host *sdhci_pltfm_init(struct platform_device *pdev,
if (!host->ioaddr) {
dev_err(&pdev->dev, "failed to remap registers\n");
ret = -ENOMEM;
- goto err_remap;
+ goto err_request;
}
/*
@@ -177,8 +178,6 @@ struct sdhci_host *sdhci_pltfm_init(struct platform_device *pdev,
return host;
-err_remap:
- release_mem_region(iomem->start, resource_size(iomem));
err_request:
sdhci_free_host(host);
err:
@@ -190,10 +189,8 @@ EXPORT_SYMBOL_GPL(sdhci_pltfm_init);
void sdhci_pltfm_free(struct platform_device *pdev)
{
struct sdhci_host *host = platform_get_drvdata(pdev);
- struct resource *iomem = platform_get_resource(pdev, IORESOURCE_MEM, 0);
iounmap(host->ioaddr);
- release_mem_region(iomem->start, resource_size(iomem));
sdhci_free_host(host);
}
EXPORT_SYMBOL_GPL(sdhci_pltfm_free);
--
1.9.1
Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread
[PATCH v2 0/7] mmc: sdhci-pltfm: fix and tidy up sdhci_pltfm_init() Masahiro Yamada <yamada.masahiro@socionext.com> - 2016-04-20 04:20 +0200 [PATCH v2 2/7] mmc: sdhci-pltfm: check return value of platform_get_irq() Masahiro Yamada <yamada.masahiro@socionext.com> - 2016-04-20 04:20 +0200 [PATCH v2 4/7] mmc: sdhci-pltfm: use devm_ioremap() Masahiro Yamada <yamada.masahiro@socionext.com> - 2016-04-20 04:20 +0200 [PATCH v2 3/7] mmc: sdhci-pltfm: use devm_request_mem_region() Masahiro Yamada <yamada.masahiro@socionext.com> - 2016-04-20 04:20 +0200 [PATCH v2 5/7] mmc: sdhci-pltfm: use devm_ioremap_resource() Masahiro Yamada <yamada.masahiro@socionext.com> - 2016-04-20 04:20 +0200 [PATCH v2 1/7] mmc: sdhci-pltfm: drop error message for too small MMIO resource size Masahiro Yamada <yamada.masahiro@socionext.com> - 2016-04-20 04:20 +0200 [PATCH v2 7/7] mmc: sdhci-pltfm: call platform_get_irq() before sdhci_alloc_host() Masahiro Yamada <yamada.masahiro@socionext.com> - 2016-04-20 04:20 +0200 [PATCH v2 6/7] mmc: sdhci-pltfm: move devm_ioremap_resource() up Masahiro Yamada <yamada.masahiro@socionext.com> - 2016-04-20 04:20 +0200 Re: [PATCH v2 0/7] mmc: sdhci-pltfm: fix and tidy up sdhci_pltfm_init() Adrian Hunter <adrian.hunter@intel.com> - 2016-04-20 08:20 +0200 Re: [PATCH v2 0/7] mmc: sdhci-pltfm: fix and tidy up sdhci_pltfm_init() Ulf Hansson <ulf.hansson@linaro.org> - 2016-04-22 15:00 +0200
csiph-web