From f212e8b39f665b24797b0818153875adb23d85d7 Mon Sep 17 00:00:00 2001 From: Christian Marangi Date: Thu, 10 Apr 2025 21:35:25 +0200 Subject: [PATCH] ubootenv-nvram: convert driver to .remove_new Convert driver to .remove_new in preparation for kernel 6.12 support. Link: https://github.com/openwrt/openwrt/pull/18454 Signed-off-by: Christian Marangi --- package/kernel/ubootenv-nvram/src/ubootenv-nvram.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/package/kernel/ubootenv-nvram/src/ubootenv-nvram.c b/package/kernel/ubootenv-nvram/src/ubootenv-nvram.c index 106e41231c9..ba1d7973f18 100644 --- a/package/kernel/ubootenv-nvram/src/ubootenv-nvram.c +++ b/package/kernel/ubootenv-nvram/src/ubootenv-nvram.c @@ -132,18 +132,17 @@ static int ubootenv_probe(struct platform_device *pdev) return misc_register(&data->misc); } -static int ubootenv_remove(struct platform_device *pdev) +static void ubootenv_remove(struct platform_device *pdev) { struct ubootenv_drvdata *data = platform_get_drvdata(pdev); data->env = NULL; misc_deregister(&data->misc); - return 0; } static struct platform_driver ubootenv_driver = { .probe = ubootenv_probe, - .remove = ubootenv_remove, + .remove_new = ubootenv_remove, .driver = { .name = NAME, .of_match_table = of_ubootenv_match, -- 2.47.2