Commit ab5bcaf1 authored Nov 11, 2024 by Greg Kroah-Hartman

Merge tag 'fpga-for-6.13-rc1' of...

Merge tag 'fpga-for-6.13-rc1' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/fpga/linux-fpga

 into char-misc-next

Xu writes:

FPGA Manager changes for 6.12-rc1

- Uwe's change switch back to use platform_driver::remove()

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.13-rc1' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/fpga/linux-fpga:
  fpga: Switch back to struct platform_driver::remove()

parents c4dab082 dbbd975c

drivers/fpga/altera-fpga2sdram.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -152,7 +152,7 @@ MODULE_DEVICE_TABLE(of, altera_fpga_of_match);

		static struct platform_driver altera_fpga_driver = {
		.probe = alt_fpga_bridge_probe,
		.remove_new = alt_fpga_bridge_remove,
		.remove = alt_fpga_bridge_remove,
		.driver = {
		.name = "altera_fpga2sdram_bridge",
		.of_match_table = of_match_ptr(altera_fpga_of_match),

drivers/fpga/altera-freeze-bridge.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -262,7 +262,7 @@ static void altera_freeze_br_remove(struct platform_device *pdev)

		static struct platform_driver altera_freeze_br_driver = {
		.probe = altera_freeze_br_probe,
		.remove_new = altera_freeze_br_remove,
		.remove = altera_freeze_br_remove,
		.driver = {
		.name = "altera_freeze_br",
		.of_match_table = altera_freeze_br_of_match,

drivers/fpga/altera-hps2fpga.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -205,7 +205,7 @@ MODULE_DEVICE_TABLE(of, altera_fpga_of_match);

		static struct platform_driver alt_fpga_bridge_driver = {
		.probe = alt_fpga_bridge_probe,
		.remove_new = alt_fpga_bridge_remove,
		.remove = alt_fpga_bridge_remove,
		.driver = {
		.name = "altera_hps2fpga_bridge",
		.of_match_table = of_match_ptr(altera_fpga_of_match),

drivers/fpga/dfl-afu-main.c

+4 −4

Original line number	Diff line number	Diff line
		@@ -952,7 +952,7 @@ static struct platform_driver afu_driver = {
		.dev_groups = afu_dev_groups,
		},
		.probe = afu_probe,
		.remove_new = afu_remove,
		.remove = afu_remove,
		};

		static int __init afu_init(void)

drivers/fpga/dfl-fme-br.c

+4 −4

Original line number	Diff line number	Diff line
		@@ -96,7 +96,7 @@ static struct platform_driver fme_br_driver = {
		.name = DFL_FPGA_FME_BRIDGE,
		},
		.probe = fme_br_probe,
		.remove_new = fme_br_remove,
		.remove = fme_br_remove,
		};

		module_platform_driver(fme_br_driver);