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

hwmon: 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/hwmonto 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.

While touching these files, make indention of the struct initializer
consistent in several files.

Signed-off-by: Uwe Kleine-König <u.kleine-koenig@baylibre.com>
Message-ID: <20241017155900.137357-2-u.kleine-koenig@baylibre.com>
Signed-off-by: Guenter Roeck <linux@roeck-us.net>

authored by

Uwe Kleine-König and committed by
Guenter Roeck
6126f7bb 0eed6fc3

+28 -28
+1 -1
drivers/hwmon/abituguru.c
··· 1531 1531 .pm = pm_sleep_ptr(&abituguru_pm), 1532 1532 }, 1533 1533 .probe = abituguru_probe, 1534 - .remove_new = abituguru_remove, 1534 + .remove = abituguru_remove, 1535 1535 }; 1536 1536 1537 1537 static int __init abituguru_detect(void)
+2 -2
drivers/hwmon/abituguru3.c
··· 1147 1147 static DEFINE_SIMPLE_DEV_PM_OPS(abituguru3_pm, abituguru3_suspend, abituguru3_resume); 1148 1148 1149 1149 static struct platform_driver abituguru3_driver = { 1150 - .driver = { 1150 + .driver = { 1151 1151 .name = ABIT_UGURU3_NAME, 1152 1152 .pm = pm_sleep_ptr(&abituguru3_pm), 1153 1153 }, 1154 1154 .probe = abituguru3_probe, 1155 - .remove_new = abituguru3_remove, 1155 + .remove = abituguru3_remove, 1156 1156 }; 1157 1157 1158 1158 static int __init abituguru3_dmi_detect(void)
+1 -1
drivers/hwmon/aspeed-g6-pwm-tach.c
··· 534 534 535 535 static struct platform_driver aspeed_pwm_tach_driver = { 536 536 .probe = aspeed_pwm_tach_probe, 537 - .remove_new = aspeed_pwm_tach_remove, 537 + .remove = aspeed_pwm_tach_remove, 538 538 .driver = { 539 539 .name = "aspeed-g6-pwm-tach", 540 540 .of_match_table = aspeed_pwm_tach_match,
+1 -1
drivers/hwmon/da9052-hwmon.c
··· 473 473 474 474 static struct platform_driver da9052_hwmon_driver = { 475 475 .probe = da9052_hwmon_probe, 476 - .remove_new = da9052_hwmon_remove, 476 + .remove = da9052_hwmon_remove, 477 477 .driver = { 478 478 .name = "da9052-hwmon", 479 479 },
+1 -1
drivers/hwmon/dme1737.c
··· 2721 2721 .name = "dme1737", 2722 2722 }, 2723 2723 .probe = dme1737_isa_probe, 2724 - .remove_new = dme1737_isa_remove, 2724 + .remove = dme1737_isa_remove, 2725 2725 }; 2726 2726 2727 2727 /* ---------------------------------------------------------------------
+1 -1
drivers/hwmon/f71805f.c
··· 1497 1497 .name = DRVNAME, 1498 1498 }, 1499 1499 .probe = f71805f_probe, 1500 - .remove_new = f71805f_remove, 1500 + .remove = f71805f_remove, 1501 1501 }; 1502 1502 1503 1503 static int __init f71805f_device_add(unsigned short address,
+1 -1
drivers/hwmon/f71882fg.c
··· 2658 2658 .name = DRVNAME, 2659 2659 }, 2660 2660 .probe = f71882fg_probe, 2661 - .remove_new = f71882fg_remove, 2661 + .remove = f71882fg_remove, 2662 2662 }; 2663 2663 2664 2664 static int __init f71882fg_init(void)
+1 -1
drivers/hwmon/i5k_amb.c
··· 568 568 .name = DRVNAME, 569 569 }, 570 570 .probe = i5k_amb_probe, 571 - .remove_new = i5k_amb_remove, 571 + .remove = i5k_amb_remove, 572 572 }; 573 573 574 574 static int __init i5k_amb_init(void)
+1 -1
drivers/hwmon/max197.c
··· 332 332 .name = "max197", 333 333 }, 334 334 .probe = max197_probe, 335 - .remove_new = max197_remove, 335 + .remove = max197_remove, 336 336 .id_table = max197_device_ids, 337 337 }; 338 338 module_platform_driver(max197_driver);
+1 -1
drivers/hwmon/mc13783-adc.c
··· 315 315 MODULE_DEVICE_TABLE(platform, mc13783_adc_idtable); 316 316 317 317 static struct platform_driver mc13783_adc_driver = { 318 - .remove_new = mc13783_adc_remove, 318 + .remove = mc13783_adc_remove, 319 319 .driver = { 320 320 .name = DRIVER_NAME, 321 321 },
+2 -2
drivers/hwmon/occ/p9_sbe.c
··· 192 192 .name = "occ-hwmon", 193 193 .of_match_table = p9_sbe_occ_of_match, 194 194 }, 195 - .probe = p9_sbe_occ_probe, 196 - .remove_new = p9_sbe_occ_remove, 195 + .probe = p9_sbe_occ_probe, 196 + .remove = p9_sbe_occ_remove, 197 197 }; 198 198 199 199 module_platform_driver(p9_sbe_occ_driver);
+1 -1
drivers/hwmon/pc87360.c
··· 1606 1606 .name = DRIVER_NAME, 1607 1607 }, 1608 1608 .probe = pc87360_probe, 1609 - .remove_new = pc87360_remove, 1609 + .remove = pc87360_remove, 1610 1610 }; 1611 1611 1612 1612 /*
+1 -1
drivers/hwmon/pc87427.c
··· 1129 1129 .name = DRVNAME, 1130 1130 }, 1131 1131 .probe = pc87427_probe, 1132 - .remove_new = pc87427_remove, 1132 + .remove = pc87427_remove, 1133 1133 }; 1134 1134 1135 1135 static int __init pc87427_device_add(const struct pc87427_sio_data *sio_data)
+1 -1
drivers/hwmon/sch5636.c
··· 512 512 .name = DRVNAME, 513 513 }, 514 514 .probe = sch5636_probe, 515 - .remove_new = sch5636_remove, 515 + .remove = sch5636_remove, 516 516 .id_table = sch5636_device_id, 517 517 }; 518 518
+1 -1
drivers/hwmon/sht15.c
··· 1051 1051 .of_match_table = of_match_ptr(sht15_dt_match), 1052 1052 }, 1053 1053 .probe = sht15_probe, 1054 - .remove_new = sht15_remove, 1054 + .remove = sht15_remove, 1055 1055 .id_table = sht15_device_ids, 1056 1056 }; 1057 1057 module_platform_driver(sht15_driver);
+1 -1
drivers/hwmon/sis5595.c
··· 784 784 .name = DRIVER_NAME, 785 785 }, 786 786 .probe = sis5595_probe, 787 - .remove_new = sis5595_remove, 787 + .remove = sis5595_remove, 788 788 }; 789 789 790 790 static int sis5595_pci_probe(struct pci_dev *dev,
+1 -1
drivers/hwmon/smsc47m1.c
··· 858 858 .driver = { 859 859 .name = DRVNAME, 860 860 }, 861 - .remove_new = __exit_p(smsc47m1_remove), 861 + .remove = __exit_p(smsc47m1_remove), 862 862 }; 863 863 864 864 static int __init smsc47m1_device_add(unsigned short address,
+1 -1
drivers/hwmon/ultra45_env.c
··· 317 317 .of_match_table = env_match, 318 318 }, 319 319 .probe = env_probe, 320 - .remove_new = env_remove, 320 + .remove = env_remove, 321 321 }; 322 322 323 323 module_platform_driver(env_driver);
+1 -1
drivers/hwmon/via-cputemp.c
··· 197 197 .name = DRVNAME, 198 198 }, 199 199 .probe = via_cputemp_probe, 200 - .remove_new = via_cputemp_remove, 200 + .remove = via_cputemp_remove, 201 201 }; 202 202 203 203 struct pdev_entry {
+1 -1
drivers/hwmon/via686a.c
··· 799 799 .name = DRIVER_NAME, 800 800 }, 801 801 .probe = via686a_probe, 802 - .remove_new = via686a_remove, 802 + .remove = via686a_remove, 803 803 }; 804 804 805 805 static const struct pci_device_id via686a_pci_ids[] = {
+1 -1
drivers/hwmon/vt1211.c
··· 1221 1221 .name = DRVNAME, 1222 1222 }, 1223 1223 .probe = vt1211_probe, 1224 - .remove_new = vt1211_remove, 1224 + .remove = vt1211_remove, 1225 1225 }; 1226 1226 1227 1227 static int __init vt1211_device_add(unsigned short address)
+2 -2
drivers/hwmon/vt8231.c
··· 910 910 911 911 912 912 static struct platform_driver vt8231_driver = { 913 - .driver = { 913 + .driver = { 914 914 .name = DRIVER_NAME, 915 915 }, 916 916 .probe = vt8231_probe, 917 - .remove_new = vt8231_remove, 917 + .remove = vt8231_remove, 918 918 }; 919 919 920 920 static const struct pci_device_id vt8231_pci_ids[] = {
+1 -1
drivers/hwmon/w83627hf.c
··· 1844 1844 .pm = W83627HF_DEV_PM_OPS, 1845 1845 }, 1846 1846 .probe = w83627hf_probe, 1847 - .remove_new = w83627hf_remove, 1847 + .remove = w83627hf_remove, 1848 1848 }; 1849 1849 1850 1850 static int __init w83627hf_find(int sioaddr, unsigned short *addr,
+1 -1
drivers/hwmon/w83781d.c
··· 1828 1828 .name = "w83781d", 1829 1829 }, 1830 1830 .probe = w83781d_isa_probe, 1831 - .remove_new = w83781d_isa_remove, 1831 + .remove = w83781d_isa_remove, 1832 1832 }; 1833 1833 1834 1834 /* return 1 if a supported chip is found, 0 otherwise */
+1 -1
drivers/hwmon/xgene-hwmon.c
··· 772 772 773 773 static struct platform_driver xgene_hwmon_driver = { 774 774 .probe = xgene_hwmon_probe, 775 - .remove_new = xgene_hwmon_remove, 775 + .remove = xgene_hwmon_remove, 776 776 .driver = { 777 777 .name = "xgene-slimpro-hwmon", 778 778 .of_match_table = xgene_hwmon_of_match,