]> git.ipfire.org Git - thirdparty/openwrt.git/commitdiff
ubootenv-nvram: convert driver to .remove_new 18454/head
authorChristian Marangi <ansuelsmth@gmail.com>
Thu, 10 Apr 2025 19:35:25 +0000 (21:35 +0200)
committerChristian Marangi <ansuelsmth@gmail.com>
Fri, 11 Apr 2025 09:21:20 +0000 (11:21 +0200)
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 <ansuelsmth@gmail.com>
package/kernel/ubootenv-nvram/src/ubootenv-nvram.c

index 106e41231c90944c400f9303b5696ce3f0e2ed61..ba1d7973f1810524b852958c97a80f4d128fe5a7 100644 (file)
@@ -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,