aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStephen Rothwell <sfr@canb.auug.org.au>2024-04-29 16:17:21 +1000
committerStephen Rothwell <sfr@canb.auug.org.au>2024-04-29 16:17:21 +1000
commitbb31d56a0443194d962f101d261988fea43ab7ed (patch)
treefc3dabf506eb91407c0b2ace080881a96cf2a1c5
parent47c85f4c8219247f7534011b3fa4eb32f21893a4 (diff)
parent297f26dbf870d4f19591b74a0ab535c327917b81 (diff)
downloadlinux-next-history-bb31d56a0443194d962f101d261988fea43ab7ed.tar.gz
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/pateldipen1984/linux.git
Notice: this object is not reachable from any branch.
Notice: this object is not reachable from any branch.
-rw-r--r--drivers/hte/hte-tegra194-test.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/hte/hte-tegra194-test.c b/drivers/hte/hte-tegra194-test.c
index ab2edff018eb68..8ee038ccf601dc 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,