Skip to content

Commit dbbd975

Browse files
ukleinekXu Yilun
authored andcommitted
fpga: Switch back to struct platform_driver::remove()
After commit 0edb555 ("platform: Make platform_driver::remove() return void") .remove() is (again) the right callback to implement for platform drivers. Convert all platform drivers below drivers/fpga to use .remove(), with the eventual goal to drop struct platform_driver::remove_new(). As .remove() and .remove_new() have the same prototypes, conversion is done by just changing the structure member name in the driver initializer. A few white space changes are included to make indention consistent. Signed-off-by: Uwe Kleine-König <[email protected]> Acked-by: Xu Yilun <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Xu Yilun <[email protected]>
1 parent 9852d85 commit dbbd975

13 files changed

+25
-25
lines changed

drivers/fpga/altera-fpga2sdram.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,7 @@ MODULE_DEVICE_TABLE(of, altera_fpga_of_match);
152152

153153
static struct platform_driver altera_fpga_driver = {
154154
.probe = alt_fpga_bridge_probe,
155-
.remove_new = alt_fpga_bridge_remove,
155+
.remove = alt_fpga_bridge_remove,
156156
.driver = {
157157
.name = "altera_fpga2sdram_bridge",
158158
.of_match_table = of_match_ptr(altera_fpga_of_match),

drivers/fpga/altera-freeze-bridge.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -262,7 +262,7 @@ static void altera_freeze_br_remove(struct platform_device *pdev)
262262

263263
static struct platform_driver altera_freeze_br_driver = {
264264
.probe = altera_freeze_br_probe,
265-
.remove_new = altera_freeze_br_remove,
265+
.remove = altera_freeze_br_remove,
266266
.driver = {
267267
.name = "altera_freeze_br",
268268
.of_match_table = altera_freeze_br_of_match,

drivers/fpga/altera-hps2fpga.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -205,7 +205,7 @@ MODULE_DEVICE_TABLE(of, altera_fpga_of_match);
205205

206206
static struct platform_driver alt_fpga_bridge_driver = {
207207
.probe = alt_fpga_bridge_probe,
208-
.remove_new = alt_fpga_bridge_remove,
208+
.remove = alt_fpga_bridge_remove,
209209
.driver = {
210210
.name = "altera_hps2fpga_bridge",
211211
.of_match_table = of_match_ptr(altera_fpga_of_match),

drivers/fpga/dfl-afu-main.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -947,12 +947,12 @@ static const struct attribute_group *afu_dev_groups[] = {
947947
};
948948

949949
static struct platform_driver afu_driver = {
950-
.driver = {
951-
.name = DFL_FPGA_FEATURE_DEV_PORT,
950+
.driver = {
951+
.name = DFL_FPGA_FEATURE_DEV_PORT,
952952
.dev_groups = afu_dev_groups,
953953
},
954-
.probe = afu_probe,
955-
.remove_new = afu_remove,
954+
.probe = afu_probe,
955+
.remove = afu_remove,
956956
};
957957

958958
static int __init afu_init(void)

drivers/fpga/dfl-fme-br.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -92,11 +92,11 @@ static void fme_br_remove(struct platform_device *pdev)
9292
}
9393

9494
static struct platform_driver fme_br_driver = {
95-
.driver = {
96-
.name = DFL_FPGA_FME_BRIDGE,
95+
.driver = {
96+
.name = DFL_FPGA_FME_BRIDGE,
9797
},
98-
.probe = fme_br_probe,
99-
.remove_new = fme_br_remove,
98+
.probe = fme_br_probe,
99+
.remove = fme_br_remove,
100100
};
101101

102102
module_platform_driver(fme_br_driver);

drivers/fpga/dfl-fme-main.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -742,12 +742,12 @@ static const struct attribute_group *fme_dev_groups[] = {
742742
};
743743

744744
static struct platform_driver fme_driver = {
745-
.driver = {
746-
.name = DFL_FPGA_FEATURE_DEV_FME,
745+
.driver = {
746+
.name = DFL_FPGA_FEATURE_DEV_FME,
747747
.dev_groups = fme_dev_groups,
748748
},
749-
.probe = fme_probe,
750-
.remove_new = fme_remove,
749+
.probe = fme_probe,
750+
.remove = fme_remove,
751751
};
752752

753753
module_platform_driver(fme_driver);

drivers/fpga/dfl-fme-region.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -71,11 +71,11 @@ static void fme_region_remove(struct platform_device *pdev)
7171
}
7272

7373
static struct platform_driver fme_region_driver = {
74-
.driver = {
75-
.name = DFL_FPGA_FME_REGION,
74+
.driver = {
75+
.name = DFL_FPGA_FME_REGION,
7676
},
77-
.probe = fme_region_probe,
78-
.remove_new = fme_region_remove,
77+
.probe = fme_region_probe,
78+
.remove = fme_region_remove,
7979
};
8080

8181
module_platform_driver(fme_region_driver);

drivers/fpga/intel-m10-bmc-sec-update.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -759,7 +759,7 @@ MODULE_DEVICE_TABLE(platform, intel_m10bmc_sec_ids);
759759

760760
static struct platform_driver intel_m10bmc_sec_driver = {
761761
.probe = m10bmc_sec_probe,
762-
.remove_new = m10bmc_sec_remove,
762+
.remove = m10bmc_sec_remove,
763763
.driver = {
764764
.name = "intel-m10bmc-sec-update",
765765
.dev_groups = m10bmc_sec_attr_groups,

drivers/fpga/of-fpga-region.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -436,7 +436,7 @@ static void of_fpga_region_remove(struct platform_device *pdev)
436436

437437
static struct platform_driver of_fpga_region_driver = {
438438
.probe = of_fpga_region_probe,
439-
.remove_new = of_fpga_region_remove,
439+
.remove = of_fpga_region_remove,
440440
.driver = {
441441
.name = "of-fpga-region",
442442
.of_match_table = of_match_ptr(fpga_region_of_match),

drivers/fpga/socfpga-a10.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -535,7 +535,7 @@ MODULE_DEVICE_TABLE(of, socfpga_a10_fpga_of_match);
535535

536536
static struct platform_driver socfpga_a10_fpga_driver = {
537537
.probe = socfpga_a10_fpga_probe,
538-
.remove_new = socfpga_a10_fpga_remove,
538+
.remove = socfpga_a10_fpga_remove,
539539
.driver = {
540540
.name = "socfpga_a10_fpga_manager",
541541
.of_match_table = socfpga_a10_fpga_of_match,

0 commit comments

Comments
 (0)