scsi: zfcp: Trace when request remove fails after qdio send fails

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

diff --git a/drivers/fpga/xilinx-spi.c b/drivers/fpga/xilinx-spi.c
index fee4d0abf6bfe6d349110420c60ecc854d81bf47..e1a227e7ff2ae73a7332976cae007863744ef34c 100644 (file)
--- a/drivers/fpga/xilinx-spi.c
+++ b/drivers/fpga/xilinx-spi.c
@@ -247,20 +247,19 @@ static int xilinx_spi_probe(struct spi_device *spi)
                return dev_err_probe(&spi->dev, PTR_ERR(conf->done),
                                     "Failed to get DONE gpio\n");
 
-       mgr = devm_fpga_mgr_create(&spi->dev,
-                                  "Xilinx Slave Serial FPGA Manager",
-                                  &xilinx_spi_ops, conf);
-       if (!mgr)
-               return -ENOMEM;
-
-       return devm_fpga_mgr_register(&spi->dev, mgr);
+       mgr = devm_fpga_mgr_register(&spi->dev,
+                                    "Xilinx Slave Serial FPGA Manager",
+                                    &xilinx_spi_ops, conf);
+       return PTR_ERR_OR_ZERO(mgr);
 }
 
+#ifdef CONFIG_OF
 static const struct of_device_id xlnx_spi_of_match[] = {
        { .compatible = "xlnx,fpga-slave-serial", },
        {}
 };
 MODULE_DEVICE_TABLE(of, xlnx_spi_of_match);
+#endif
 
 static struct spi_driver xilinx_slave_spi_driver = {
        .driver = {