diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2023-12-23 15:49:44 +0300 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2023-12-23 15:49:44 +0300 |
| commit | 228abb1d8e676ba809645b9764dd53959571ab8f (patch) | |
| tree | e51efc1870550071ea9f3392d2fa7bd1e5777cec /drivers/fpga/zynq-fpga.c | |
| parent | b2231e4875e80de74e02f1664d5182242921acae (diff) | |
| parent | c849ecb2ae8413f86c84627cb0af06dffce4e215 (diff) | |
| download | linux-228abb1d8e676ba809645b9764dd53959571ab8f.tar.xz | |
Merge tag 'fpga-for-6.8-rc1-2' of git://git.kernel.org/pub/scm/linux/kernel/git/fpga/linux-fpga into char-misc-next
Xu writes:
FPGA Manager changes for 6.8-rc1 second part
Not sure if it's too late for 6.8 rc1, but I try to speed up this
intermediate change.
- Uwe's change convert to new platform remove callback.
All patches have been reviewed on the mailing list, and have been in the
last linux-next releases (as part of our for-next branch).
Signed-off-by: Xu Yilun <yilun.xu@intel.com>
* tag 'fpga-for-6.8-rc1-2' of git://git.kernel.org/pub/scm/linux/kernel/git/fpga/linux-fpga:
fpga: zynq-fpga: Convert to platform remove callback returning void
fpga: xilinx-pr-decoupler: Convert to platform remove callback returning void
fpga: stratix10-soc: Convert to platform remove callback returning void
fpga: socfpga-a10: Convert to platform remove callback returning void
fpga: of-fpga-region: Convert to platform remove callback returning void
fpga: intel-m10-bmc-sec-update: Convert to platform remove callback returning void
fpga: dfl-fme-region: Convert to platform remove callback returning void
fpga: dfl-fme-main: Convert to platform remove callback returning void
fpga: dfl-fme-br: Convert to platform remove callback returning void
fpga: dfl-afu-main: Convert to platform remove callback returning void
fpga: altera-hps2fpga: Convert to platform remove callback returning void
fpga: altera-freeze-bridge: Convert to platform remove callback returning void
fpga: altera-fpga2sdram: Convert to platform remove callback returning void
Diffstat (limited to 'drivers/fpga/zynq-fpga.c')
| -rw-r--r-- | drivers/fpga/zynq-fpga.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/fpga/zynq-fpga.c b/drivers/fpga/zynq-fpga.c index 96611d424a10..0ac93183d201 100644 --- a/drivers/fpga/zynq-fpga.c +++ b/drivers/fpga/zynq-fpga.c @@ -618,7 +618,7 @@ static int zynq_fpga_probe(struct platform_device *pdev) return 0; } -static int zynq_fpga_remove(struct platform_device *pdev) +static void zynq_fpga_remove(struct platform_device *pdev) { struct zynq_fpga_priv *priv; struct fpga_manager *mgr; @@ -629,8 +629,6 @@ static int zynq_fpga_remove(struct platform_device *pdev) fpga_mgr_unregister(mgr); clk_unprepare(priv->clk); - - return 0; } #ifdef CONFIG_OF @@ -644,7 +642,7 @@ MODULE_DEVICE_TABLE(of, zynq_fpga_of_match); static struct platform_driver zynq_fpga_driver = { .probe = zynq_fpga_probe, - .remove = zynq_fpga_remove, + .remove_new = zynq_fpga_remove, .driver = { .name = "zynq_fpga_manager", .of_match_table = of_match_ptr(zynq_fpga_of_match), |