Skip to content

Commit 494c3dc

Browse files
ukleinekbroonie
authored andcommitted
spi: 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/spi 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. The change for the spi-npcm-fiu stands out in the diffstat because the inconsistent formatting style of the platform_driver initializer is fixed to match the other struct initializer in the file. Signed-off-by: Uwe Kleine-König <u.kleine-koenig@baylibre.com> Link: https://patch.msgid.link/20240925113501.25208-2-u.kleine-koenig@baylibre.com Signed-off-by: Mark Brown <broonie@kernel.org>
1 parent 610442f commit 494c3dc

88 files changed

Lines changed: 92 additions & 92 deletions

Some content is hidden

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

drivers/spi/atmel-quadspi.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -840,7 +840,7 @@ static struct platform_driver atmel_qspi_driver = {
840840
.pm = pm_ptr(&atmel_qspi_pm_ops),
841841
},
842842
.probe = atmel_qspi_probe,
843-
.remove_new = atmel_qspi_remove,
843+
.remove = atmel_qspi_remove,
844844
};
845845
module_platform_driver(atmel_qspi_driver);
846846

drivers/spi/spi-ar934x.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -223,7 +223,7 @@ static struct platform_driver ar934x_spi_driver = {
223223
.of_match_table = ar934x_spi_match,
224224
},
225225
.probe = ar934x_spi_probe,
226-
.remove_new = ar934x_spi_remove,
226+
.remove = ar934x_spi_remove,
227227
};
228228

229229
module_platform_driver(ar934x_spi_driver);

drivers/spi/spi-aspeed-smc.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1189,7 +1189,7 @@ MODULE_DEVICE_TABLE(of, aspeed_spi_matches);
11891189

11901190
static struct platform_driver aspeed_spi_driver = {
11911191
.probe = aspeed_spi_probe,
1192-
.remove_new = aspeed_spi_remove,
1192+
.remove = aspeed_spi_remove,
11931193
.driver = {
11941194
.name = DEVICE_NAME,
11951195
.of_match_table = aspeed_spi_matches,

drivers/spi/spi-at91-usart.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -650,7 +650,7 @@ static struct platform_driver at91_usart_spi_driver = {
650650
.pm = &at91_usart_spi_pm_ops,
651651
},
652652
.probe = at91_usart_spi_probe,
653-
.remove_new = at91_usart_spi_remove,
653+
.remove = at91_usart_spi_remove,
654654
};
655655

656656
module_platform_driver(at91_usart_spi_driver);

drivers/spi/spi-ath79.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -253,7 +253,7 @@ MODULE_DEVICE_TABLE(of, ath79_spi_of_match);
253253

254254
static struct platform_driver ath79_spi_driver = {
255255
.probe = ath79_spi_probe,
256-
.remove_new = ath79_spi_remove,
256+
.remove = ath79_spi_remove,
257257
.shutdown = ath79_spi_shutdown,
258258
.driver = {
259259
.name = DRV_NAME,

drivers/spi/spi-atmel.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1781,7 +1781,7 @@ static struct platform_driver atmel_spi_driver = {
17811781
.of_match_table = atmel_spi_dt_ids,
17821782
},
17831783
.probe = atmel_spi_probe,
1784-
.remove_new = atmel_spi_remove,
1784+
.remove = atmel_spi_remove,
17851785
};
17861786
module_platform_driver(atmel_spi_driver);
17871787

drivers/spi/spi-au1550.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -940,7 +940,7 @@ MODULE_ALIAS("platform:au1550-spi");
940940

941941
static struct platform_driver au1550_spi_drv = {
942942
.probe = au1550_spi_probe,
943-
.remove_new = au1550_spi_remove,
943+
.remove = au1550_spi_remove,
944944
.driver = {
945945
.name = "au1550-spi",
946946
},

drivers/spi/spi-bcm2835.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1435,7 +1435,7 @@ static struct platform_driver bcm2835_spi_driver = {
14351435
.of_match_table = bcm2835_spi_match,
14361436
},
14371437
.probe = bcm2835_spi_probe,
1438-
.remove_new = bcm2835_spi_remove,
1438+
.remove = bcm2835_spi_remove,
14391439
.shutdown = bcm2835_spi_remove,
14401440
};
14411441
module_platform_driver(bcm2835_spi_driver);

drivers/spi/spi-bcm2835aux.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -577,7 +577,7 @@ static struct platform_driver bcm2835aux_spi_driver = {
577577
.of_match_table = bcm2835aux_spi_match,
578578
},
579579
.probe = bcm2835aux_spi_probe,
580-
.remove_new = bcm2835aux_spi_remove,
580+
.remove = bcm2835aux_spi_remove,
581581
};
582582
module_platform_driver(bcm2835aux_spi_driver);
583583

drivers/spi/spi-bcm63xx-hsspi.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -944,7 +944,7 @@ static struct platform_driver bcm63xx_hsspi_driver = {
944944
.of_match_table = bcm63xx_hsspi_of_match,
945945
},
946946
.probe = bcm63xx_hsspi_probe,
947-
.remove_new = bcm63xx_hsspi_remove,
947+
.remove = bcm63xx_hsspi_remove,
948948
};
949949

950950
module_platform_driver(bcm63xx_hsspi_driver);

0 commit comments

Comments
 (0)