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

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

diff --git a/drivers/fpga/zynq-fpga.c b/drivers/fpga/zynq-fpga.c
index ae0da361e6c6282448995155fa2aa6e8cd5f11be..0ac93183d201650d8e8a0f9b106bbb6e40183a76 100644 (file)
--- a/drivers/fpga/zynq-fpga.c
+++ b/drivers/fpga/zynq-fpga.c
@@ -493,15 +493,15 @@ static int zynq_fpga_ops_write_complete(struct fpga_manager *mgr,
        if (err)
                return err;
 
-       /* Release 'PR' control back to the ICAP */
-       zynq_fpga_write(priv, CTRL_OFFSET,
-               zynq_fpga_read(priv, CTRL_OFFSET) & ~CTRL_PCAP_PR_MASK);
-
        err = zynq_fpga_poll_timeout(priv, INT_STS_OFFSET, intr_status,
                                     intr_status & IXR_PCFG_DONE_MASK,
                                     INIT_POLL_DELAY,
                                     INIT_POLL_TIMEOUT);
 
+       /* Release 'PR' control back to the ICAP */
+       zynq_fpga_write(priv, CTRL_OFFSET,
+                       zynq_fpga_read(priv, CTRL_OFFSET) & ~CTRL_PCAP_PR_MASK);
+
        clk_disable(priv->clk);
 
        if (err)
@@ -555,7 +555,6 @@ static int zynq_fpga_probe(struct platform_device *pdev)
        struct device *dev = &pdev->dev;
        struct zynq_fpga_priv *priv;
        struct fpga_manager *mgr;
-       struct resource *res;
        int err;
 
        priv = devm_kzalloc(dev, sizeof(*priv), GFP_KERNEL);
@@ -563,8 +562,7 @@ static int zynq_fpga_probe(struct platform_device *pdev)
                return -ENOMEM;
        spin_lock_init(&priv->dma_lock);
 
-       res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-       priv->io_base = devm_ioremap_resource(dev, res);
+       priv->io_base = devm_platform_ioremap_resource(pdev, 0);
        if (IS_ERR(priv->io_base))
                return PTR_ERR(priv->io_base);
 
@@ -620,7 +618,7 @@ static int zynq_fpga_probe(struct platform_device *pdev)
        return 0;
 }
 
-static int zynq_fpga_remove(struct platform_device *pdev)
+static void zynq_fpga_remove(struct platform_device *pdev)
 {
        struct zynq_fpga_priv *priv;
        struct fpga_manager *mgr;
@@ -631,8 +629,6 @@ static int zynq_fpga_remove(struct platform_device *pdev)
        fpga_mgr_unregister(mgr);
 
        clk_unprepare(priv->clk);
-
-       return 0;
 }
 
 #ifdef CONFIG_OF
@@ -646,7 +642,7 @@ MODULE_DEVICE_TABLE(of, zynq_fpga_of_match);
 
 static struct platform_driver zynq_fpga_driver = {
        .probe = zynq_fpga_probe,
-       .remove = zynq_fpga_remove,
+       .remove_new = zynq_fpga_remove,
        .driver = {
                .name = "zynq_fpga_manager",
                .of_match_table = of_match_ptr(zynq_fpga_of_match),