Merge tag 'for-net-next-2021-11-16' of git://git.kernel.org/pub/scm/linux/kernel...

[linux-2.6-microblaze.git] / drivers / mtd / spi-nor / controllers / hisi-sfc.c

diff --git a/drivers/mtd/spi-nor/controllers/hisi-sfc.c b/drivers/mtd/spi-nor/controllers/hisi-sfc.c
index 47fbf1d..94a9691 100644 (file)
--- a/drivers/mtd/spi-nor/controllers/hisi-sfc.c
+++ b/drivers/mtd/spi-nor/controllers/hisi-sfc.c
@@ -421,7 +421,6 @@ fail:
 static int hisi_spi_nor_probe(struct platform_device *pdev)
 {
        struct device *dev = &pdev->dev;
-       struct resource *res;
        struct hifmc_host *host;
        int ret;
 
@@ -432,13 +431,11 @@ static int hisi_spi_nor_probe(struct platform_device *pdev)
        platform_set_drvdata(pdev, host);
        host->dev = dev;
 
-       res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "control");
-       host->regbase = devm_ioremap_resource(dev, res);
+       host->regbase = devm_platform_ioremap_resource_byname(pdev, "control");
        if (IS_ERR(host->regbase))
                return PTR_ERR(host->regbase);
 
-       res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "memory");
-       host->iobase = devm_ioremap_resource(dev, res);
+       host->iobase = devm_platform_ioremap_resource_byname(pdev, "memory");
        if (IS_ERR(host->iobase))
                return PTR_ERR(host->iobase);
 
@@ -477,7 +474,6 @@ static int hisi_spi_nor_remove(struct platform_device *pdev)
 
        hisi_spi_nor_unregister_all(host);
        mutex_destroy(&host->lock);
-       clk_disable_unprepare(host->clk);
        return 0;
 }