diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2024-05-15 00:57:51 +0300 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2024-05-15 00:57:51 +0300 |
| commit | 00fddaf58854717a075f3690c828b61290701e7e (patch) | |
| tree | 5243637469b5adb61911f882abbe718c1cd1750b | |
| parent | a8cc7eb996f751e20c8c6454601b9184f010aa07 (diff) | |
| parent | 297f26dbf870d4f19591b74a0ab535c327917b81 (diff) | |
| download | linux-00fddaf58854717a075f3690c828b61290701e7e.tar.xz | |
Merge tag 'for-6.10-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/pateldipen1984/linux
Pull hte/timestamp update from Dipen Patel:
- Improve hte-test driver platform remove callback by replacing it with
the remove_new which returns void instead
* tag 'for-6.10-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/pateldipen1984/linux:
hte: tegra-194: Convert to platform remove callback returning void
| -rw-r--r-- | drivers/hte/hte-tegra194-test.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/hte/hte-tegra194-test.c b/drivers/hte/hte-tegra194-test.c index ab2edff018eb..8ee038ccf601 100644 --- a/drivers/hte/hte-tegra194-test.c +++ b/drivers/hte/hte-tegra194-test.c @@ -214,7 +214,7 @@ out: return ret; } -static int tegra_hte_test_remove(struct platform_device *pdev) +static void tegra_hte_test_remove(struct platform_device *pdev) { (void)pdev; @@ -222,13 +222,11 @@ static int tegra_hte_test_remove(struct platform_device *pdev) gpiod_put(hte.gpio_in); gpiod_put(hte.gpio_out); del_timer_sync(&hte.timer); - - return 0; } static struct platform_driver tegra_hte_test_driver = { .probe = tegra_hte_test_probe, - .remove = tegra_hte_test_remove, + .remove_new = tegra_hte_test_remove, .driver = { .name = "tegra_hte_test", .of_match_table = tegra_hte_test_of_match, |