Merge tag 'kbuild-v6.9' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy...

[J-linux.git] / drivers / fpga / socfpga.c

diff --git a/drivers/fpga/socfpga.c b/drivers/fpga/socfpga.c
index 7e0741f996968ae33ce5acf48d2ec8e2eed0b84c..723ea0ad3f09b6980f6d422edf192650229cf065 100644 (file)
--- a/drivers/fpga/socfpga.c
+++ b/drivers/fpga/socfpga.c
@@ -545,20 +545,17 @@ static int socfpga_fpga_probe(struct platform_device *pdev)
        struct device *dev = &pdev->dev;
        struct socfpga_fpga_priv *priv;
        struct fpga_manager *mgr;
-       struct resource *res;
        int ret;
 
        priv = devm_kzalloc(dev, sizeof(*priv), GFP_KERNEL);
        if (!priv)
                return -ENOMEM;
 
-       res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-       priv->fpga_base_addr = devm_ioremap_resource(dev, res);
+       priv->fpga_base_addr = devm_platform_ioremap_resource(pdev, 0);
        if (IS_ERR(priv->fpga_base_addr))
                return PTR_ERR(priv->fpga_base_addr);
 
-       res = platform_get_resource(pdev, IORESOURCE_MEM, 1);
-       priv->fpga_data_addr = devm_ioremap_resource(dev, res);
+       priv->fpga_data_addr = devm_platform_ioremap_resource(pdev, 1);
        if (IS_ERR(priv->fpga_data_addr))
                return PTR_ERR(priv->fpga_data_addr);