]> git.proxmox.com Git - mirror_ubuntu-hirsute-kernel.git/commitdiff
fpga: fpga-mgr: machxo2-spi: Simplify registration
authorMoritz Fischer <mdf@kernel.org>
Sun, 15 Nov 2020 19:51:22 +0000 (11:51 -0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 1 Dec 2020 17:49:32 +0000 (18:49 +0100)
Simplify registration using new devm_fpga_mgr_register() API.

Reviewed-by: Tom Rix <trix@redhat.com>
Signed-off-by: Moritz Fischer <mdf@kernel.org>
Link: https://lore.kernel.org/r/20201115195127.284487-6-mdf@kernel.org
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/fpga/machxo2-spi.c

index b316369156fe6b5087916c63484568c3901f9085..114a64d2b7a4d68f81b50f73f9c38446a370d3d5 100644 (file)
@@ -371,18 +371,7 @@ static int machxo2_spi_probe(struct spi_device *spi)
        if (!mgr)
                return -ENOMEM;
 
-       spi_set_drvdata(spi, mgr);
-
-       return fpga_mgr_register(mgr);
-}
-
-static int machxo2_spi_remove(struct spi_device *spi)
-{
-       struct fpga_manager *mgr = spi_get_drvdata(spi);
-
-       fpga_mgr_unregister(mgr);
-
-       return 0;
+       return devm_fpga_mgr_register(dev, mgr);
 }
 
 static const struct of_device_id of_match[] = {
@@ -403,7 +392,6 @@ static struct spi_driver machxo2_spi_driver = {
                .of_match_table = of_match_ptr(of_match),
        },
        .probe = machxo2_spi_probe,
-       .remove = machxo2_spi_remove,
        .id_table = lattice_ids,
 };