Merge tag 'clk-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux

[J-linux.git] / drivers / fpga / machxo2-spi.c

diff --git a/drivers/fpga/machxo2-spi.c b/drivers/fpga/machxo2-spi.c
index a582e0000c97aa7967e0c22f7b7e8fdbfdf6f309..4d8a876415874a73010f8c649610c900ae76f798 100644 (file)
--- a/drivers/fpga/machxo2-spi.c
+++ b/drivers/fpga/machxo2-spi.c
@@ -356,25 +356,20 @@ static int machxo2_spi_probe(struct spi_device *spi)
 {
        struct device *dev = &spi->dev;
        struct fpga_manager *mgr;
-       int ret;
 
        if (spi->max_speed_hz > MACHXO2_MAX_SPEED) {
                dev_err(dev, "Speed is too high\n");
                return -EINVAL;
        }
 
-       mgr = fpga_mgr_create(dev, "Lattice MachXO2 SPI FPGA Manager",
-                             &machxo2_ops, spi);
+       mgr = devm_fpga_mgr_create(dev, "Lattice MachXO2 SPI FPGA Manager",
+                                  &machxo2_ops, spi);
        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 machxo2_spi_remove(struct spi_device *spi)