Merge tag 'tags/upstream-4.20-rc1' of git://git.infradead.org/linux-ubifs

[linux.git] / drivers / fpga / altera-ps-spi.c

diff --git a/drivers/fpga/altera-ps-spi.c b/drivers/fpga/altera-ps-spi.c
index 24b25c62603665aee105e394121110c59f65ad91..33aafda50af5d8046d74c212849dd8e753bcce18 100644 (file)
--- a/drivers/fpga/altera-ps-spi.c
+++ b/drivers/fpga/altera-ps-spi.c
@@ -239,7 +239,6 @@ static int altera_ps_probe(struct spi_device *spi)
        struct altera_ps_conf *conf;
        const struct of_device_id *of_id;
        struct fpga_manager *mgr;
-       int ret;
 
        conf = devm_kzalloc(&spi->dev, sizeof(*conf), GFP_KERNEL);
        if (!conf)
@@ -275,18 +274,14 @@ static int altera_ps_probe(struct spi_device *spi)
        snprintf(conf->mgr_name, sizeof(conf->mgr_name), "%s %s",
                 dev_driver_string(&spi->dev), dev_name(&spi->dev));
 
-       mgr = fpga_mgr_create(&spi->dev, conf->mgr_name,
-                             &altera_ps_ops, conf);
+       mgr = devm_fpga_mgr_create(&spi->dev, conf->mgr_name,
+                                  &altera_ps_ops, conf);
        if (!mgr)
                return -ENOMEM;
 
        spi_set_drvdata(spi, mgr);
 
-       ret = fpga_mgr_register(mgr);
-       if (ret)
-               fpga_mgr_free(mgr);
-
-       return ret;
+       return fpga_mgr_register(mgr);
 }
 
 static int altera_ps_remove(struct spi_device *spi)