Skip to content

Commit 5cbb9b1

Browse files
ukleinekgregkh
authored andcommitted
serial: 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/tty/serial 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. Signed-off-by: Uwe Kleine-König <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Greg Kroah-Hartman <[email protected]>
1 parent 8cf0b93 commit 5cbb9b1

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

66 files changed

+66
-66
lines changed

drivers/tty/serial/8250/8250_aspeed_vuart.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -569,7 +569,7 @@ static struct platform_driver aspeed_vuart_driver = {
569569
.of_match_table = aspeed_vuart_table,
570570
},
571571
.probe = aspeed_vuart_probe,
572-
.remove_new = aspeed_vuart_remove,
572+
.remove = aspeed_vuart_remove,
573573
};
574574

575575
module_platform_driver(aspeed_vuart_driver);

drivers/tty/serial/8250/8250_bcm2835aux.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -267,7 +267,7 @@ static struct platform_driver bcm2835aux_serial_driver = {
267267
.pm = pm_ptr(&bcm2835aux_dev_pm_ops),
268268
},
269269
.probe = bcm2835aux_serial_probe,
270-
.remove_new = bcm2835aux_serial_remove,
270+
.remove = bcm2835aux_serial_remove,
271271
};
272272
module_platform_driver(bcm2835aux_serial_driver);
273273

drivers/tty/serial/8250/8250_bcm7271.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1204,7 +1204,7 @@ static struct platform_driver brcmuart_platform_driver = {
12041204
.of_match_table = brcmuart_dt_ids,
12051205
},
12061206
.probe = brcmuart_probe,
1207-
.remove_new = brcmuart_remove,
1207+
.remove = brcmuart_remove,
12081208
};
12091209

12101210
static int __init brcmuart_init(void)

drivers/tty/serial/8250/8250_dw.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -796,7 +796,7 @@ static struct platform_driver dw8250_platform_driver = {
796796
.acpi_match_table = dw8250_acpi_match,
797797
},
798798
.probe = dw8250_probe,
799-
.remove_new = dw8250_remove,
799+
.remove = dw8250_remove,
800800
};
801801

802802
module_platform_driver(dw8250_platform_driver);

drivers/tty/serial/8250/8250_em.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -219,7 +219,7 @@ static struct platform_driver serial8250_em_platform_driver = {
219219
.of_match_table = serial8250_em_dt_ids,
220220
},
221221
.probe = serial8250_em_probe,
222-
.remove_new = serial8250_em_remove,
222+
.remove = serial8250_em_remove,
223223
};
224224

225225
module_platform_driver(serial8250_em_platform_driver);

drivers/tty/serial/8250/8250_fsl.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -179,7 +179,7 @@ static struct platform_driver fsl8250_platform_driver = {
179179
.acpi_match_table = ACPI_PTR(fsl_8250_acpi_id),
180180
},
181181
.probe = fsl8250_acpi_probe,
182-
.remove_new = fsl8250_acpi_remove,
182+
.remove = fsl8250_acpi_remove,
183183
};
184184

185185
module_platform_driver(fsl8250_platform_driver);

drivers/tty/serial/8250/8250_ingenic.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -361,7 +361,7 @@ static struct platform_driver ingenic_uart_platform_driver = {
361361
.of_match_table = of_match,
362362
},
363363
.probe = ingenic_uart_probe,
364-
.remove_new = ingenic_uart_remove,
364+
.remove = ingenic_uart_remove,
365365
};
366366

367367
module_platform_driver(ingenic_uart_platform_driver);

drivers/tty/serial/8250/8250_ioc3.c

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

8585
static struct platform_driver serial8250_ioc3_driver = {
8686
.probe = serial8250_ioc3_probe,
87-
.remove_new = serial8250_ioc3_remove,
87+
.remove = serial8250_ioc3_remove,
8888
.driver = {
8989
.name = "ioc3-serial8250",
9090
}

drivers/tty/serial/8250/8250_lpc18xx.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -195,7 +195,7 @@ MODULE_DEVICE_TABLE(of, lpc18xx_serial_match);
195195

196196
static struct platform_driver lpc18xx_serial_driver = {
197197
.probe = lpc18xx_serial_probe,
198-
.remove_new = lpc18xx_serial_remove,
198+
.remove = lpc18xx_serial_remove,
199199
.driver = {
200200
.name = "lpc18xx-uart",
201201
.of_match_table = lpc18xx_serial_match,

drivers/tty/serial/8250/8250_mtk.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -654,7 +654,7 @@ static struct platform_driver mtk8250_platform_driver = {
654654
.of_match_table = mtk8250_of_match,
655655
},
656656
.probe = mtk8250_probe,
657-
.remove_new = mtk8250_remove,
657+
.remove = mtk8250_remove,
658658
};
659659
module_platform_driver(mtk8250_platform_driver);
660660

0 commit comments

Comments
 (0)