Merge tag '6.6-rc-smb3-client-fixes-part2' of git://git.samba.org/sfrench/cifs-2.6

[sfrench/cifs-2.6.git] / drivers / fpga / ts73xx-fpga.c

diff --git a/drivers/fpga/ts73xx-fpga.c b/drivers/fpga/ts73xx-fpga.c
index 8e6e9c840d9df9b7a32f8bd6ffab17a0e1481f79..4e1d2a4d3df446cb7ec354eaee3d4c0a5ec9b8f5 100644 (file)
--- a/drivers/fpga/ts73xx-fpga.c
+++ b/drivers/fpga/ts73xx-fpga.c
@@ -103,7 +103,6 @@ static int ts73xx_fpga_probe(struct platform_device *pdev)
        struct device *kdev = &pdev->dev;
        struct ts73xx_fpga_priv *priv;
        struct fpga_manager *mgr;
-       struct resource *res;
 
        priv = devm_kzalloc(kdev, sizeof(*priv), GFP_KERNEL);
        if (!priv)
@@ -111,8 +110,7 @@ static int ts73xx_fpga_probe(struct platform_device *pdev)
 
        priv->dev = kdev;
 
-       res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-       priv->io_base = devm_ioremap_resource(kdev, res);
+       priv->io_base = devm_platform_ioremap_resource(pdev, 0);
        if (IS_ERR(priv->io_base))
                return PTR_ERR(priv->io_base);