Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

soc: 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/soc 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.

On the way do a few whitespace changes to make indention consistent.

Signed-off-by: Uwe Kleine-König <u.kleine-koenig@baylibre.com>
Acked-by: Heiko Stuebner <heiko@sntech.de>
Acked-by: Herve Codina <herve.codina@bootlin.com> # for fsl/qe/{qmc,tsa}.c
Acked-by: Bjorn Andersson <andersson@kernel.org> # qcom parts
Acked-by: Gabriel Somlo <gsomlo@gmail.com>
Acked-by: Andrew Jeffery <andrew@codeconstruct.com.au> # aspeed
Link: https://lore.kernel.org/r/20241029074859.509587-2-u.kleine-koenig@baylibre.com
Signed-off-by: Arnd Bergmann <arnd@arndb.de>

authored by

Uwe Kleine-König and committed by
Arnd Bergmann
511c06e3 42f7652d

+54 -54
+1 -1
drivers/soc/aspeed/aspeed-lpc-ctrl.c
··· 353 353 .of_match_table = aspeed_lpc_ctrl_match, 354 354 }, 355 355 .probe = aspeed_lpc_ctrl_probe, 356 - .remove_new = aspeed_lpc_ctrl_remove, 356 + .remove = aspeed_lpc_ctrl_remove, 357 357 }; 358 358 359 359 module_platform_driver(aspeed_lpc_ctrl_driver);
+1 -1
drivers/soc/aspeed/aspeed-lpc-snoop.c
··· 366 366 .of_match_table = aspeed_lpc_snoop_match, 367 367 }, 368 368 .probe = aspeed_lpc_snoop_probe, 369 - .remove_new = aspeed_lpc_snoop_remove, 369 + .remove = aspeed_lpc_snoop_remove, 370 370 }; 371 371 372 372 module_platform_driver(aspeed_lpc_snoop_driver);
+1 -1
drivers/soc/aspeed/aspeed-p2a-ctrl.c
··· 431 431 .of_match_table = aspeed_p2a_ctrl_match, 432 432 }, 433 433 .probe = aspeed_p2a_ctrl_probe, 434 - .remove_new = aspeed_p2a_ctrl_remove, 434 + .remove = aspeed_p2a_ctrl_remove, 435 435 }; 436 436 437 437 module_platform_driver(aspeed_p2a_ctrl_driver);
+1 -1
drivers/soc/aspeed/aspeed-uart-routing.c
··· 589 589 .of_match_table = aspeed_uart_routing_table, 590 590 }, 591 591 .probe = aspeed_uart_routing_probe, 592 - .remove_new = aspeed_uart_routing_remove, 592 + .remove = aspeed_uart_routing_remove, 593 593 }; 594 594 595 595 module_platform_driver(aspeed_uart_routing_driver);
+1 -1
drivers/soc/fsl/dpaa2-console.c
··· 320 320 .of_match_table = dpaa2_console_match_table, 321 321 }, 322 322 .probe = dpaa2_console_probe, 323 - .remove_new = dpaa2_console_remove, 323 + .remove = dpaa2_console_remove, 324 324 }; 325 325 module_platform_driver(dpaa2_console_driver); 326 326
+1 -1
drivers/soc/fsl/qe/qmc.c
··· 2092 2092 .of_match_table = of_match_ptr(qmc_id_table), 2093 2093 }, 2094 2094 .probe = qmc_probe, 2095 - .remove_new = qmc_remove, 2095 + .remove = qmc_remove, 2096 2096 }; 2097 2097 module_platform_driver(qmc_driver); 2098 2098
+1 -1
drivers/soc/fsl/qe/tsa.c
··· 1086 1086 .of_match_table = of_match_ptr(tsa_id_table), 1087 1087 }, 1088 1088 .probe = tsa_probe, 1089 - .remove_new = tsa_remove, 1089 + .remove = tsa_remove, 1090 1090 }; 1091 1091 module_platform_driver(tsa_driver); 1092 1092
+1 -1
drivers/soc/fujitsu/a64fx-diag.c
··· 142 142 .acpi_match_table = ACPI_PTR(a64fx_diag_acpi_match), 143 143 }, 144 144 .probe = a64fx_diag_probe, 145 - .remove_new = a64fx_diag_remove, 145 + .remove = a64fx_diag_remove, 146 146 }; 147 147 148 148 module_platform_driver(a64fx_diag_driver);
+1 -1
drivers/soc/hisilicon/kunpeng_hccs.c
··· 1348 1348 1349 1349 static struct platform_driver hccs_driver = { 1350 1350 .probe = hccs_probe, 1351 - .remove_new = hccs_remove, 1351 + .remove = hccs_remove, 1352 1352 .driver = { 1353 1353 .name = "kunpeng_hccs", 1354 1354 .acpi_match_table = hccs_acpi_match,
+1 -1
drivers/soc/ixp4xx/ixp4xx-npe.c
··· 759 759 .of_match_table = ixp4xx_npe_of_match, 760 760 }, 761 761 .probe = ixp4xx_npe_probe, 762 - .remove_new = ixp4xx_npe_remove, 762 + .remove = ixp4xx_npe_remove, 763 763 }; 764 764 module_platform_driver(ixp4xx_npe_driver); 765 765
+1 -1
drivers/soc/ixp4xx/ixp4xx-qmgr.c
··· 461 461 .of_match_table = ixp4xx_qmgr_of_match, 462 462 }, 463 463 .probe = ixp4xx_qmgr_probe, 464 - .remove_new = ixp4xx_qmgr_remove, 464 + .remove = ixp4xx_qmgr_remove, 465 465 }; 466 466 module_platform_driver(ixp4xx_qmgr_driver); 467 467
+1 -1
drivers/soc/litex/litex_soc_ctrl.c
··· 131 131 .of_match_table = litex_soc_ctrl_of_match, 132 132 }, 133 133 .probe = litex_soc_ctrl_probe, 134 - .remove_new = litex_soc_ctrl_remove, 134 + .remove = litex_soc_ctrl_remove, 135 135 }; 136 136 137 137 module_platform_driver(litex_soc_ctrl_driver);
+1 -1
drivers/soc/loongson/loongson2_guts.c
··· 169 169 .of_match_table = loongson2_guts_of_match, 170 170 }, 171 171 .probe = loongson2_guts_probe, 172 - .remove_new = loongson2_guts_remove, 172 + .remove = loongson2_guts_remove, 173 173 }; 174 174 175 175 static int __init loongson2_guts_init(void)
+1 -1
drivers/soc/mediatek/mtk-devapc.c
··· 301 301 302 302 static struct platform_driver mtk_devapc_driver = { 303 303 .probe = mtk_devapc_probe, 304 - .remove_new = mtk_devapc_remove, 304 + .remove = mtk_devapc_remove, 305 305 .driver = { 306 306 .name = "mtk-devapc", 307 307 .of_match_table = mtk_devapc_dt_match,
+1 -1
drivers/soc/mediatek/mtk-mmsys.c
··· 487 487 .of_match_table = of_match_mtk_mmsys, 488 488 }, 489 489 .probe = mtk_mmsys_probe, 490 - .remove_new = mtk_mmsys_remove, 490 + .remove = mtk_mmsys_remove, 491 491 }; 492 492 module_platform_driver(mtk_mmsys_drv); 493 493
+1 -1
drivers/soc/mediatek/mtk-socinfo.c
··· 187 187 188 188 static struct platform_driver mtk_socinfo = { 189 189 .probe = mtk_socinfo_probe, 190 - .remove_new = mtk_socinfo_remove, 190 + .remove = mtk_socinfo_remove, 191 191 .driver = { 192 192 .name = "mtk-socinfo", 193 193 },
+1 -1
drivers/soc/microchip/mpfs-sys-controller.c
··· 232 232 .of_match_table = mpfs_sys_controller_of_match, 233 233 }, 234 234 .probe = mpfs_sys_controller_probe, 235 - .remove_new = mpfs_sys_controller_remove, 235 + .remove = mpfs_sys_controller_remove, 236 236 }; 237 237 module_platform_driver(mpfs_sys_controller_driver); 238 238
+1 -1
drivers/soc/pxa/ssp.c
··· 197 197 198 198 static struct platform_driver pxa_ssp_driver = { 199 199 .probe = pxa_ssp_probe, 200 - .remove_new = pxa_ssp_remove, 200 + .remove = pxa_ssp_remove, 201 201 .driver = { 202 202 .name = "pxa2xx-ssp", 203 203 .of_match_table = of_match_ptr(pxa_ssp_of_ids),
+1 -1
drivers/soc/qcom/icc-bwmon.c
··· 872 872 873 873 static struct platform_driver bwmon_driver = { 874 874 .probe = bwmon_probe, 875 - .remove_new = bwmon_remove, 875 + .remove = bwmon_remove, 876 876 .driver = { 877 877 .name = "qcom-bwmon", 878 878 .of_match_table = bwmon_of_match,
+1 -1
drivers/soc/qcom/llcc-qcom.c
··· 1401 1401 .of_match_table = qcom_llcc_of_match, 1402 1402 }, 1403 1403 .probe = qcom_llcc_probe, 1404 - .remove_new = qcom_llcc_remove, 1404 + .remove = qcom_llcc_remove, 1405 1405 }; 1406 1406 module_platform_driver(qcom_llcc_driver); 1407 1407
+1 -1
drivers/soc/qcom/ocmem.c
··· 439 439 440 440 static struct platform_driver ocmem_driver = { 441 441 .probe = ocmem_dev_probe, 442 - .remove_new = ocmem_dev_remove, 442 + .remove = ocmem_dev_remove, 443 443 .driver = { 444 444 .name = "ocmem", 445 445 .of_match_table = ocmem_of_match,
+1 -1
drivers/soc/qcom/pmic_glink.c
··· 380 380 381 381 static struct platform_driver pmic_glink_driver = { 382 382 .probe = pmic_glink_probe, 383 - .remove_new = pmic_glink_remove, 383 + .remove = pmic_glink_remove, 384 384 .driver = { 385 385 .name = "qcom_pmic_glink", 386 386 .of_match_table = pmic_glink_of_match,
+1 -1
drivers/soc/qcom/qcom_aoss.c
··· 664 664 .suppress_bind_attrs = true, 665 665 }, 666 666 .probe = qmp_probe, 667 - .remove_new = qmp_remove, 667 + .remove = qmp_remove, 668 668 }; 669 669 module_platform_driver(qmp_driver); 670 670
+1 -1
drivers/soc/qcom/qcom_gsbi.c
··· 232 232 .of_match_table = gsbi_dt_match, 233 233 }, 234 234 .probe = gsbi_probe, 235 - .remove_new = gsbi_remove, 235 + .remove = gsbi_remove, 236 236 }; 237 237 238 238 module_platform_driver(gsbi_driver);
+1 -1
drivers/soc/qcom/qcom_stats.c
··· 274 274 275 275 static struct platform_driver qcom_stats = { 276 276 .probe = qcom_stats_probe, 277 - .remove_new = qcom_stats_remove, 277 + .remove = qcom_stats_remove, 278 278 .driver = { 279 279 .name = "qcom_stats", 280 280 .of_match_table = qcom_stats_table,
+2 -2
drivers/soc/qcom/ramp_controller.c
··· 331 331 .of_match_table = qcom_ramp_controller_match_table, 332 332 .suppress_bind_attrs = true, 333 333 }, 334 - .probe = qcom_ramp_controller_probe, 335 - .remove_new = qcom_ramp_controller_remove, 334 + .probe = qcom_ramp_controller_probe, 335 + .remove = qcom_ramp_controller_remove, 336 336 }; 337 337 338 338 static int __init qcom_ramp_controller_init(void)
+1 -1
drivers/soc/qcom/rmtfs_mem.c
··· 315 315 316 316 static struct platform_driver qcom_rmtfs_mem_driver = { 317 317 .probe = qcom_rmtfs_mem_probe, 318 - .remove_new = qcom_rmtfs_mem_remove, 318 + .remove = qcom_rmtfs_mem_remove, 319 319 .driver = { 320 320 .name = "qcom_rmtfs_mem", 321 321 .of_match_table = qcom_rmtfs_mem_of_match,
+1 -1
drivers/soc/qcom/rpm-proc.c
··· 53 53 54 54 static struct platform_driver rpm_proc_driver = { 55 55 .probe = rpm_proc_probe, 56 - .remove_new = rpm_proc_remove, 56 + .remove = rpm_proc_remove, 57 57 .driver = { 58 58 .name = "qcom-rpm-proc", 59 59 .of_match_table = rpm_proc_of_match,
+1 -1
drivers/soc/qcom/rpm_master_stats.c
··· 155 155 156 156 static struct platform_driver master_stats_driver = { 157 157 .probe = master_stats_probe, 158 - .remove_new = master_stats_remove, 158 + .remove = master_stats_remove, 159 159 .driver = { 160 160 .name = "qcom_rpm_master_stats", 161 161 .of_match_table = rpm_master_table,
+1 -1
drivers/soc/qcom/smem.c
··· 1251 1251 1252 1252 static struct platform_driver qcom_smem_driver = { 1253 1253 .probe = qcom_smem_probe, 1254 - .remove_new = qcom_smem_remove, 1254 + .remove = qcom_smem_remove, 1255 1255 .driver = { 1256 1256 .name = "qcom-smem", 1257 1257 .of_match_table = qcom_smem_of_match,
+1 -1
drivers/soc/qcom/smp2p.c
··· 698 698 699 699 static struct platform_driver qcom_smp2p_driver = { 700 700 .probe = qcom_smp2p_probe, 701 - .remove_new = qcom_smp2p_remove, 701 + .remove = qcom_smp2p_remove, 702 702 .driver = { 703 703 .name = "qcom_smp2p", 704 704 .of_match_table = qcom_smp2p_of_match,
+3 -3
drivers/soc/qcom/smsm.c
··· 682 682 683 683 static struct platform_driver qcom_smsm_driver = { 684 684 .probe = qcom_smsm_probe, 685 - .remove_new = qcom_smsm_remove, 686 - .driver = { 687 - .name = "qcom-smsm", 685 + .remove = qcom_smsm_remove, 686 + .driver = { 687 + .name = "qcom-smsm", 688 688 .of_match_table = qcom_smsm_of_match, 689 689 }, 690 690 };
+1 -1
drivers/soc/qcom/socinfo.c
··· 816 816 817 817 static struct platform_driver qcom_socinfo_driver = { 818 818 .probe = qcom_socinfo_probe, 819 - .remove_new = qcom_socinfo_remove, 819 + .remove = qcom_socinfo_remove, 820 820 .driver = { 821 821 .name = "qcom-socinfo", 822 822 },
+4 -4
drivers/soc/rockchip/io-domain.c
··· 742 742 } 743 743 744 744 static struct platform_driver rockchip_iodomain_driver = { 745 - .probe = rockchip_iodomain_probe, 746 - .remove_new = rockchip_iodomain_remove, 747 - .driver = { 748 - .name = "rockchip-iodomain", 745 + .probe = rockchip_iodomain_probe, 746 + .remove = rockchip_iodomain_remove, 747 + .driver = { 748 + .name = "rockchip-iodomain", 749 749 .of_match_table = rockchip_iodomain_match, 750 750 }, 751 751 };
+2 -2
drivers/soc/samsung/exynos-chipid.c
··· 195 195 .name = "exynos-chipid", 196 196 .of_match_table = exynos_chipid_of_device_ids, 197 197 }, 198 - .probe = exynos_chipid_probe, 199 - .remove_new = exynos_chipid_remove, 198 + .probe = exynos_chipid_probe, 199 + .remove = exynos_chipid_remove, 200 200 }; 201 201 module_platform_driver(exynos_chipid_driver); 202 202
+1 -1
drivers/soc/tegra/cbb/tegra194-cbb.c
··· 2330 2330 2331 2331 static struct platform_driver tegra194_cbb_driver = { 2332 2332 .probe = tegra194_cbb_probe, 2333 - .remove_new = tegra194_cbb_remove, 2333 + .remove = tegra194_cbb_remove, 2334 2334 .driver = { 2335 2335 .name = "tegra194-cbb", 2336 2336 .of_match_table = of_match_ptr(tegra194_cbb_match),
+1 -1
drivers/soc/ti/k3-ringacc.c
··· 1562 1562 1563 1563 static struct platform_driver k3_ringacc_driver = { 1564 1564 .probe = k3_ringacc_probe, 1565 - .remove_new = k3_ringacc_remove, 1565 + .remove = k3_ringacc_remove, 1566 1566 .driver = { 1567 1567 .name = "k3-ringacc", 1568 1568 .of_match_table = k3_ringacc_of_match,
+2 -2
drivers/soc/ti/knav_dma.c
··· 783 783 784 784 static struct platform_driver knav_dma_driver = { 785 785 .probe = knav_dma_probe, 786 - .remove_new = knav_dma_remove, 787 - .driver = { 786 + .remove = knav_dma_remove, 787 + .driver = { 788 788 .name = "keystone-navigator-dma", 789 789 .of_match_table = of_match, 790 790 },
+1 -1
drivers/soc/ti/knav_qmss_queue.c
··· 1894 1894 1895 1895 static struct platform_driver keystone_qmss_driver = { 1896 1896 .probe = knav_queue_probe, 1897 - .remove_new = knav_queue_remove, 1897 + .remove = knav_queue_remove, 1898 1898 .driver = { 1899 1899 .name = "keystone-navigator-qmss", 1900 1900 .of_match_table = keystone_qmss_of_match,
+1 -1
drivers/soc/ti/pm33xx.c
··· 591 591 .name = "pm33xx", 592 592 }, 593 593 .probe = am33xx_pm_probe, 594 - .remove_new = am33xx_pm_remove, 594 + .remove = am33xx_pm_remove, 595 595 }; 596 596 module_platform_driver(am33xx_pm_driver); 597 597
+2 -2
drivers/soc/ti/pruss.c
··· 593 593 .name = "pruss", 594 594 .of_match_table = pruss_of_match, 595 595 }, 596 - .probe = pruss_probe, 597 - .remove_new = pruss_remove, 596 + .probe = pruss_probe, 597 + .remove = pruss_remove, 598 598 }; 599 599 module_platform_driver(pruss_driver); 600 600
+1 -1
drivers/soc/ti/smartreflex.c
··· 969 969 970 970 static struct platform_driver smartreflex_driver = { 971 971 .probe = omap_sr_probe, 972 - .remove_new = omap_sr_remove, 972 + .remove = omap_sr_remove, 973 973 .shutdown = omap_sr_shutdown, 974 974 .driver = { 975 975 .name = DRIVER_NAME,
+1 -1
drivers/soc/ti/wkup_m3_ipc.c
··· 755 755 756 756 static struct platform_driver wkup_m3_ipc_driver = { 757 757 .probe = wkup_m3_ipc_probe, 758 - .remove_new = wkup_m3_ipc_remove, 758 + .remove = wkup_m3_ipc_remove, 759 759 .driver = { 760 760 .name = "wkup_m3_ipc", 761 761 .of_match_table = wkup_m3_ipc_of_match,
+1 -1
drivers/soc/xilinx/xlnx_event_manager.c
··· 709 709 710 710 static struct platform_driver xlnx_event_manager_driver = { 711 711 .probe = xlnx_event_manager_probe, 712 - .remove_new = xlnx_event_manager_remove, 712 + .remove = xlnx_event_manager_remove, 713 713 .driver = { 714 714 .name = "xlnx_event_manager", 715 715 },
+1 -1
drivers/soc/xilinx/zynqmp_power.c
··· 408 408 409 409 static struct platform_driver zynqmp_pm_platform_driver = { 410 410 .probe = zynqmp_pm_probe, 411 - .remove_new = zynqmp_pm_remove, 411 + .remove = zynqmp_pm_remove, 412 412 .driver = { 413 413 .name = "zynqmp_power", 414 414 .of_match_table = pm_of_match,