diff options
| author | Uwe Kleine-König <u.kleine-koenig@pengutronix.de> | 2024-05-25 13:07:49 +0200 |
|---|---|---|
| committer | Uwe Kleine-König <u.kleine-koenig@pengutronix.de> | 2024-05-27 10:10:43 +0200 |
| commit | eef3811433a53b7db2ea7d2be809e23a70ff42bc (patch) | |
| tree | 9cc98478dbdef5c17effb9b8b652c06f30b69995 /drivers/reset/reset-ti-sci.c | |
| parent | 1613e604df0cd359cf2a7fbd9be7a0bcfacfabd0 (diff) | |
| parent | 6d89df61650d155b9033d9f507f3580f9177e623 (diff) | |
| download | linux-eef3811433a53b7db2ea7d2be809e23a70ff42bc.tar.gz linux-eef3811433a53b7db2ea7d2be809e23a70ff42bc.tar.bz2 linux-eef3811433a53b7db2ea7d2be809e23a70ff42bc.zip | |
Merge branch 'reset/next' of git://git.pengutronix.de/pza/linux
Philipp didn't come around to send a pull request in the last
development cycle. His next branch only contains patches converting
three platform drivers to stop using .remove().
They are merged with his consent to be able to change the prototype of
.remove() in the upcoming development cycle.
Link: https://lore.kernel.org/all/9b7e1a88a812f5c86ada75b094c95b9cf65891c3.camel@pengutronix.de/
Diffstat (limited to 'drivers/reset/reset-ti-sci.c')
| -rw-r--r-- | drivers/reset/reset-ti-sci.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/reset/reset-ti-sci.c b/drivers/reset/reset-ti-sci.c index cc01fa5b0bea..d384da0982fa 100644 --- a/drivers/reset/reset-ti-sci.c +++ b/drivers/reset/reset-ti-sci.c @@ -235,20 +235,18 @@ static int ti_sci_reset_probe(struct platform_device *pdev) return reset_controller_register(&data->rcdev); } -static int ti_sci_reset_remove(struct platform_device *pdev) +static void ti_sci_reset_remove(struct platform_device *pdev) { struct ti_sci_reset_data *data = platform_get_drvdata(pdev); reset_controller_unregister(&data->rcdev); idr_destroy(&data->idr); - - return 0; } static struct platform_driver ti_sci_reset_driver = { .probe = ti_sci_reset_probe, - .remove = ti_sci_reset_remove, + .remove_new = ti_sci_reset_remove, .driver = { .name = "ti-sci-reset", .of_match_table = ti_sci_reset_of_match, |