diff options
| author |   Russell King <rmk+kernel@armlinux.org.uk> | 2021-02-02 14:37:25 +0000 |
|---|---|---|
| committer | Russell King <rmk+kernel@armlinux.org.uk> | 2021-02-02 14:37:25 +0000 |
| commit | 9d4d8572a539ef807e21c196f145aa365fd52f0e (patch) | |
| tree | 59a4fcd89ce86de32f068c2052f17a348188ae7e /drivers/fpga/ice40-spi.c | |
| parent | Linux 5.10 (diff) | |
| parent | amba: Make use of bus_type functions (diff) | |
| download | wireguard-linux-9d4d8572a539ef807e21c196f145aa365fd52f0e.tar.xz wireguard-linux-9d4d8572a539ef807e21c196f145aa365fd52f0e.zip | |
Merge tag 'amba-make-remove-return-void' of https://git.pengutronix.de/git/ukl/linux into devel-stable
Tag for adaptions to struct amba_driver::remove changing prototype
Diffstat (limited to 'drivers/fpga/ice40-spi.c')
| -rw-r--r-- | drivers/fpga/ice40-spi.c | 14 |
1 files changed, 1 insertions, 13 deletions
diff --git a/drivers/fpga/ice40-spi.c b/drivers/fpga/ice40-spi.c index 8d689fea0dab..69dec5af23c3 100644 --- a/drivers/fpga/ice40-spi.c +++ b/drivers/fpga/ice40-spi.c @@ -183,18 +183,7 @@ static int ice40_fpga_probe(struct spi_device *spi) if (!mgr) return -ENOMEM; - spi_set_drvdata(spi, mgr); - - return fpga_mgr_register(mgr); -} - -static int ice40_fpga_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 ice40_fpga_of_match[] = { @@ -205,7 +194,6 @@ MODULE_DEVICE_TABLE(of, ice40_fpga_of_match); static struct spi_driver ice40_fpga_driver = { .probe = ice40_fpga_probe, - .remove = ice40_fpga_remove, .driver = { .name = "ice40spi", .of_match_table = of_match_ptr(ice40_fpga_of_match), |