]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
mmc: sdhci-acpi: Use devm_platform_ioremap_resource()
authorAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Fri, 1 Nov 2024 10:11:34 +0000 (12:11 +0200)
committerUlf Hansson <ulf.hansson@linaro.org>
Wed, 18 Dec 2024 14:42:35 +0000 (15:42 +0100)
The struct resource is not used for anything else, so we can simplify
the code a bit by using the helper function.

Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Acked-by: Adrian Hunter <adrian.hunter@intel.com>
Message-ID: <20241101101441.3518612-5-andriy.shevchenko@linux.intel.com>
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
drivers/mmc/host/sdhci-acpi.c

index d577c6515b86bc06edc12d57c196e8f417b07fc3..e6c5c82f64faadc68c85dac8310f9f5f2abd2dfd 100644 (file)
@@ -822,8 +822,6 @@ static int sdhci_acpi_probe(struct platform_device *pdev)
        struct acpi_device *device;
        struct sdhci_acpi_host *c;
        struct sdhci_host *host;
-       struct resource *iomem;
-       resource_size_t len;
        size_t priv_size;
        int quirks = 0;
        int err;
@@ -844,14 +842,6 @@ static int sdhci_acpi_probe(struct platform_device *pdev)
        if (sdhci_acpi_byt_defer(dev))
                return -EPROBE_DEFER;
 
-       iomem = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-       if (!iomem)
-               return -ENOMEM;
-
-       len = resource_size(iomem);
-       if (!devm_request_mem_region(dev, iomem->start, len, dev_name(dev)))
-               return -ENOMEM;
-
        priv_size = slot ? slot->priv_size : 0;
        host = sdhci_alloc_host(dev, sizeof(struct sdhci_acpi_host) + priv_size);
        if (IS_ERR(host))
@@ -873,10 +863,9 @@ static int sdhci_acpi_probe(struct platform_device *pdev)
                goto err_free;
        }
 
-       host->ioaddr = devm_ioremap(dev, iomem->start,
-                                           resource_size(iomem));
-       if (host->ioaddr == NULL) {
-               err = -ENOMEM;
+       host->ioaddr = devm_platform_ioremap_resource(pdev, 0);
+       if (IS_ERR(host->ioaddr)) {
+               err = PTR_ERR(host->ioaddr);
                goto err_free;
        }