Commit 00fddaf5 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents a8cc7eb9 297f26db

drivers/hte/hte-tegra194-test.c

+2 −4
Original line number Diff line number Diff line
@@ -214,7 +214,7 @@ static int tegra_hte_test_probe(struct platform_device *pdev) 
	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,