fpga: Switch back to struct platform_driver::remove()

After commit 0edb555a65d1 ("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]>

diff --git a/drivers/fpga/altera-fpga2sdram.c b/drivers/fpga/altera-fpga2sdram.c
index f4de3fea0b2dcda7bb127c2bfac1dcea376c0d0a..e41492988dd633e2653071daaade86f9dfa984ea 100644 (file)
--- a/drivers/fpga/altera-fpga2sdram.c
+++ b/drivers/fpga/altera-fpga2sdram.c
@@ -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),

diff --git a/drivers/fpga/altera-freeze-bridge.c b/drivers/fpga/altera-freeze-bridge.c
index 44061cb16f8770fe87369f5be188460987a0c50a..594693ff786e25f8aa3a57b5d9a8a2bb33da7570 100644 (file)
--- a/drivers/fpga/altera-freeze-bridge.c
+++ b/drivers/fpga/altera-freeze-bridge.c
@@ -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,

diff --git a/drivers/fpga/altera-hps2fpga.c b/drivers/fpga/altera-hps2fpga.c
index 6f8e24be19c6df7a653bbe990f2441d07b3f14e3..f2f1250689cb0a876514a5be8432ff85a4612dae 100644 (file)
--- a/drivers/fpga/altera-hps2fpga.c
+++ b/drivers/fpga/altera-hps2fpga.c
@@ -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),

diff --git a/drivers/fpga/dfl-afu-main.c b/drivers/fpga/dfl-afu-main.c
index 6b97c073849ea91e4ec90849371ea1b6ee55e9ca..2fd4f07ed081adc76a7a596eacafa2c3e29ece61 100644 (file)
--- a/drivers/fpga/dfl-afu-main.c
+++ b/drivers/fpga/dfl-afu-main.c
@@ -947,12 +947,12 @@ static const struct attribute_group *afu_dev_groups[] = {
 };
 
 static struct platform_driver afu_driver = {
-       .driver = {
-               .name       = DFL_FPGA_FEATURE_DEV_PORT,
+       .driver = {
+               .name = DFL_FPGA_FEATURE_DEV_PORT,
                .dev_groups = afu_dev_groups,
        },
-       .probe   = afu_probe,
-       .remove_new = afu_remove,
+       .probe = afu_probe,
+       .remove = afu_remove,
 };
 
 static int __init afu_init(void)

diff --git a/drivers/fpga/dfl-fme-br.c b/drivers/fpga/dfl-fme-br.c
index 0b01b389527760933899f232ba33f3d726a3dc11..950c606c59d4466a73dc020fe7c1eacc09269070 100644 (file)
--- a/drivers/fpga/dfl-fme-br.c
+++ b/drivers/fpga/dfl-fme-br.c
@@ -92,11 +92,11 @@ static void fme_br_remove(struct platform_device *pdev)
 }
 
 static struct platform_driver fme_br_driver = {
-       .driver = {
-               .name    = DFL_FPGA_FME_BRIDGE,
+       .driver = {
+               .name = DFL_FPGA_FME_BRIDGE,
        },
-       .probe   = fme_br_probe,
-       .remove_new = fme_br_remove,
+       .probe = fme_br_probe,
+       .remove = fme_br_remove,
 };
 
 module_platform_driver(fme_br_driver);

diff --git a/drivers/fpga/dfl-fme-main.c b/drivers/fpga/dfl-fme-main.c
index 864924f68f5e2c4f2a87989ad4b96800d0bbe6e0..f8d89a4a6ccbfb5eeba163cdcd7e175130545489 100644 (file)
--- a/drivers/fpga/dfl-fme-main.c
+++ b/drivers/fpga/dfl-fme-main.c
@@ -742,12 +742,12 @@ static const struct attribute_group *fme_dev_groups[] = {
 };
 
 static struct platform_driver fme_driver = {
-       .driver = {
-               .name       = DFL_FPGA_FEATURE_DEV_FME,
+       .driver = {
+               .name = DFL_FPGA_FEATURE_DEV_FME,
                .dev_groups = fme_dev_groups,
        },
-       .probe   = fme_probe,
-       .remove_new = fme_remove,
+       .probe = fme_probe,
+       .remove = fme_remove,
 };
 
 module_platform_driver(fme_driver);

diff --git a/drivers/fpga/dfl-fme-region.c b/drivers/fpga/dfl-fme-region.c
index 71616f8b4982de143fed31bdcd42deddf8367813..c6cd63063c8200df10ca647ec3414e5eeb0db7ba 100644 (file)
--- a/drivers/fpga/dfl-fme-region.c
+++ b/drivers/fpga/dfl-fme-region.c
@@ -71,11 +71,11 @@ static void fme_region_remove(struct platform_device *pdev)
 }
 
 static struct platform_driver fme_region_driver = {
-       .driver = {
-               .name    = DFL_FPGA_FME_REGION,
+       .driver = {
+               .name = DFL_FPGA_FME_REGION,
        },
-       .probe   = fme_region_probe,
-       .remove_new = fme_region_remove,
+       .probe = fme_region_probe,
+       .remove = fme_region_remove,
 };
 
 module_platform_driver(fme_region_driver);

diff --git a/drivers/fpga/intel-m10-bmc-sec-update.c b/drivers/fpga/intel-m10-bmc-sec-update.c
index 7ac9f9f5af129bcc5674c5891e11a6378e5744ee..dd515083bbdd5569f418ae05b9e3ff6b6af74c75 100644 (file)
--- a/drivers/fpga/intel-m10-bmc-sec-update.c
+++ b/drivers/fpga/intel-m10-bmc-sec-update.c
@@ -759,7 +759,7 @@ MODULE_DEVICE_TABLE(platform, intel_m10bmc_sec_ids);
 
 static struct platform_driver intel_m10bmc_sec_driver = {
        .probe = m10bmc_sec_probe,
-       .remove_new = m10bmc_sec_remove,
+       .remove = m10bmc_sec_remove,
        .driver = {
                .name = "intel-m10bmc-sec-update",
                .dev_groups = m10bmc_sec_attr_groups,

diff --git a/drivers/fpga/of-fpga-region.c b/drivers/fpga/of-fpga-region.c
index 8526a5a86f0cbe9e6729528f10b87f4c15078f79..43db4bb77138a8400873e5bb8d17c85e7e9903b6 100644 (file)
--- a/drivers/fpga/of-fpga-region.c
+++ b/drivers/fpga/of-fpga-region.c
@@ -436,7 +436,7 @@ static void of_fpga_region_remove(struct platform_device *pdev)
 
 static struct platform_driver of_fpga_region_driver = {
        .probe = of_fpga_region_probe,
-       .remove_new = of_fpga_region_remove,
+       .remove = of_fpga_region_remove,
        .driver = {
                .name   = "of-fpga-region",
                .of_match_table = of_match_ptr(fpga_region_of_match),

diff --git a/drivers/fpga/socfpga-a10.c b/drivers/fpga/socfpga-a10.c
index 4c03513b8f03b5c9c6140abea34b4be650f790ea..0165a3c86932237376dd9f1e3ca2c400e8b9bf03 100644 (file)
--- a/drivers/fpga/socfpga-a10.c
+++ b/drivers/fpga/socfpga-a10.c
@@ -535,7 +535,7 @@ MODULE_DEVICE_TABLE(of, socfpga_a10_fpga_of_match);
 
 static struct platform_driver socfpga_a10_fpga_driver = {
        .probe = socfpga_a10_fpga_probe,
-       .remove_new = socfpga_a10_fpga_remove,
+       .remove = socfpga_a10_fpga_remove,
        .driver = {
                .name   = "socfpga_a10_fpga_manager",
                .of_match_table = socfpga_a10_fpga_of_match,

diff --git a/drivers/fpga/stratix10-soc.c b/drivers/fpga/stratix10-soc.c
index 2c0def7d7cbb160c714e27a92c5006a1f91d6a5d..0a295ccf1644a86d6a335c734594d8f1e82c5bf2 100644 (file)
--- a/drivers/fpga/stratix10-soc.c
+++ b/drivers/fpga/stratix10-soc.c
@@ -455,7 +455,7 @@ MODULE_DEVICE_TABLE(of, s10_of_match);
 
 static struct platform_driver s10_driver = {
        .probe = s10_probe,
-       .remove_new = s10_remove,
+       .remove = s10_remove,
        .driver = {
                .name   = "Stratix10 SoC FPGA manager",
                .of_match_table = of_match_ptr(s10_of_match),

diff --git a/drivers/fpga/xilinx-pr-decoupler.c b/drivers/fpga/xilinx-pr-decoupler.c
index 788dd2f63a652e79f68a16177372eb25096d4380..822751fad18ae754be51a1b9ea24a554c9273fdc 100644 (file)
--- a/drivers/fpga/xilinx-pr-decoupler.c
+++ b/drivers/fpga/xilinx-pr-decoupler.c
@@ -162,7 +162,7 @@ static void xlnx_pr_decoupler_remove(struct platform_device *pdev)
 
 static struct platform_driver xlnx_pr_decoupler_driver = {
        .probe = xlnx_pr_decoupler_probe,
-       .remove_new = xlnx_pr_decoupler_remove,
+       .remove = xlnx_pr_decoupler_remove,
        .driver = {
                .name = "xlnx_pr_decoupler",
                .of_match_table = xlnx_pr_decoupler_of_match,

diff --git a/drivers/fpga/zynq-fpga.c b/drivers/fpga/zynq-fpga.c
index 4db3d80e10b090b85944cd4747e4ca2c45c52a56..f7e08f7ea9ef3cca215fbdf30cdcbf4cddbed9ea 100644 (file)
--- a/drivers/fpga/zynq-fpga.c
+++ b/drivers/fpga/zynq-fpga.c
@@ -642,7 +642,7 @@ MODULE_DEVICE_TABLE(of, zynq_fpga_of_match);
 
 static struct platform_driver zynq_fpga_driver = {
        .probe = zynq_fpga_probe,
-       .remove_new = zynq_fpga_remove,
+       .remove = zynq_fpga_remove,
        .driver = {
                .name = "zynq_fpga_manager",
                .of_match_table = of_match_ptr(zynq_fpga_of_match),