Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
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()
+25
-25
+1
-1
drivers/fpga/altera-fpga2sdram.c
+1
-1
drivers/fpga/altera-fpga2sdram.c
···
152
152
153
153
static struct platform_driver altera_fpga_driver = {
154
154
.probe = alt_fpga_bridge_probe,
155
-
.remove_new = alt_fpga_bridge_remove,
155
+
.remove = alt_fpga_bridge_remove,
156
156
.driver = {
157
157
.name = "altera_fpga2sdram_bridge",
158
158
.of_match_table = of_match_ptr(altera_fpga_of_match),
+1
-1
drivers/fpga/altera-freeze-bridge.c
+1
-1
drivers/fpga/altera-freeze-bridge.c
···
262
262
263
263
static struct platform_driver altera_freeze_br_driver = {
264
264
.probe = altera_freeze_br_probe,
265
-
.remove_new = altera_freeze_br_remove,
265
+
.remove = altera_freeze_br_remove,
266
266
.driver = {
267
267
.name = "altera_freeze_br",
268
268
.of_match_table = altera_freeze_br_of_match,
+1
-1
drivers/fpga/altera-hps2fpga.c
+1
-1
drivers/fpga/altera-hps2fpga.c
···
205
205
206
206
static struct platform_driver alt_fpga_bridge_driver = {
207
207
.probe = alt_fpga_bridge_probe,
208
-
.remove_new = alt_fpga_bridge_remove,
208
+
.remove = alt_fpga_bridge_remove,
209
209
.driver = {
210
210
.name = "altera_hps2fpga_bridge",
211
211
.of_match_table = of_match_ptr(altera_fpga_of_match),
+4
-4
drivers/fpga/dfl-afu-main.c
+4
-4
drivers/fpga/dfl-afu-main.c
···
947
947
};
948
948
949
949
static struct platform_driver afu_driver = {
950
-
.driver = {
951
-
.name = DFL_FPGA_FEATURE_DEV_PORT,
950
+
.driver = {
951
+
.name = DFL_FPGA_FEATURE_DEV_PORT,
952
952
.dev_groups = afu_dev_groups,
953
953
},
954
-
.probe = afu_probe,
955
-
.remove_new = afu_remove,
954
+
.probe = afu_probe,
955
+
.remove = afu_remove,
956
956
};
957
957
958
958
static int __init afu_init(void)
+4
-4
drivers/fpga/dfl-fme-br.c
+4
-4
drivers/fpga/dfl-fme-br.c
···
92
92
}
93
93
94
94
static struct platform_driver fme_br_driver = {
95
-
.driver = {
96
-
.name = DFL_FPGA_FME_BRIDGE,
95
+
.driver = {
96
+
.name = DFL_FPGA_FME_BRIDGE,
97
97
},
98
-
.probe = fme_br_probe,
99
-
.remove_new = fme_br_remove,
98
+
.probe = fme_br_probe,
99
+
.remove = fme_br_remove,
100
100
};
101
101
102
102
module_platform_driver(fme_br_driver);
+4
-4
drivers/fpga/dfl-fme-main.c
+4
-4
drivers/fpga/dfl-fme-main.c
···
742
742
};
743
743
744
744
static struct platform_driver fme_driver = {
745
-
.driver = {
746
-
.name = DFL_FPGA_FEATURE_DEV_FME,
745
+
.driver = {
746
+
.name = DFL_FPGA_FEATURE_DEV_FME,
747
747
.dev_groups = fme_dev_groups,
748
748
},
749
-
.probe = fme_probe,
750
-
.remove_new = fme_remove,
749
+
.probe = fme_probe,
750
+
.remove = fme_remove,
751
751
};
752
752
753
753
module_platform_driver(fme_driver);
+4
-4
drivers/fpga/dfl-fme-region.c
+4
-4
drivers/fpga/dfl-fme-region.c
···
71
71
}
72
72
73
73
static struct platform_driver fme_region_driver = {
74
-
.driver = {
75
-
.name = DFL_FPGA_FME_REGION,
74
+
.driver = {
75
+
.name = DFL_FPGA_FME_REGION,
76
76
},
77
-
.probe = fme_region_probe,
78
-
.remove_new = fme_region_remove,
77
+
.probe = fme_region_probe,
78
+
.remove = fme_region_remove,
79
79
};
80
80
81
81
module_platform_driver(fme_region_driver);
+1
-1
drivers/fpga/intel-m10-bmc-sec-update.c
+1
-1
drivers/fpga/intel-m10-bmc-sec-update.c
+1
-1
drivers/fpga/of-fpga-region.c
+1
-1
drivers/fpga/of-fpga-region.c
···
436
436
437
437
static struct platform_driver of_fpga_region_driver = {
438
438
.probe = of_fpga_region_probe,
439
-
.remove_new = of_fpga_region_remove,
439
+
.remove = of_fpga_region_remove,
440
440
.driver = {
441
441
.name = "of-fpga-region",
442
442
.of_match_table = of_match_ptr(fpga_region_of_match),
+1
-1
drivers/fpga/socfpga-a10.c
+1
-1
drivers/fpga/socfpga-a10.c
···
535
535
536
536
static struct platform_driver socfpga_a10_fpga_driver = {
537
537
.probe = socfpga_a10_fpga_probe,
538
-
.remove_new = socfpga_a10_fpga_remove,
538
+
.remove = socfpga_a10_fpga_remove,
539
539
.driver = {
540
540
.name = "socfpga_a10_fpga_manager",
541
541
.of_match_table = socfpga_a10_fpga_of_match,
+1
-1
drivers/fpga/stratix10-soc.c
+1
-1
drivers/fpga/stratix10-soc.c
+1
-1
drivers/fpga/xilinx-pr-decoupler.c
+1
-1
drivers/fpga/xilinx-pr-decoupler.c
···
162
162
163
163
static struct platform_driver xlnx_pr_decoupler_driver = {
164
164
.probe = xlnx_pr_decoupler_probe,
165
-
.remove_new = xlnx_pr_decoupler_remove,
165
+
.remove = xlnx_pr_decoupler_remove,
166
166
.driver = {
167
167
.name = "xlnx_pr_decoupler",
168
168
.of_match_table = xlnx_pr_decoupler_of_match,
+1
-1
drivers/fpga/zynq-fpga.c
+1
-1
drivers/fpga/zynq-fpga.c