[openwrt/openwrt] ltq-ptm: convert driver to .remove_new

LEDE Commits lede-commits at lists.infradead.org
Fri Apr 11 02:21:54 PDT 2025


ansuel pushed a commit to openwrt/openwrt.git, branch main:
https://git.openwrt.org/83286b911ebd05f64f25a390769bf38c38dbeb73

commit 83286b911ebd05f64f25a390769bf38c38dbeb73
Author: Christian Marangi <ansuelsmth at gmail.com>
AuthorDate: Thu Apr 10 21:34:41 2025 +0200

    ltq-ptm: 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 <ansuelsmth at gmail.com>
---
 package/kernel/lantiq/ltq-ptm/src/ifxmips_ptm_adsl.c | 6 ++----
 package/kernel/lantiq/ltq-ptm/src/ifxmips_ptm_vdsl.c | 6 ++----
 2 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/package/kernel/lantiq/ltq-ptm/src/ifxmips_ptm_adsl.c b/package/kernel/lantiq/ltq-ptm/src/ifxmips_ptm_adsl.c
index 5e5535348d..23460501e1 100644
--- a/package/kernel/lantiq/ltq-ptm/src/ifxmips_ptm_adsl.c
+++ b/package/kernel/lantiq/ltq-ptm/src/ifxmips_ptm_adsl.c
@@ -1566,7 +1566,7 @@ INIT_PRIV_DATA_FAIL:
  *  Output:
  *   none
  */
-static int ltq_ptm_remove(struct platform_device *pdev)
+static void ltq_ptm_remove(struct platform_device *pdev)
 {
     int i;
 
@@ -1591,13 +1591,11 @@ static int ltq_ptm_remove(struct platform_device *pdev)
     ifx_ptm_uninit_chip();
 
     clear_priv_data();
-
-    return 0;
 }
 
 static struct platform_driver ltq_ptm_driver = {
        .probe = ltq_ptm_probe,
-       .remove = ltq_ptm_remove,
+       .remove_new = ltq_ptm_remove,
        .driver = {
                .name = "ptm",
                .of_match_table = ltq_ptm_match,
diff --git a/package/kernel/lantiq/ltq-ptm/src/ifxmips_ptm_vdsl.c b/package/kernel/lantiq/ltq-ptm/src/ifxmips_ptm_vdsl.c
index c5bbd9fd87..b3d14122d6 100644
--- a/package/kernel/lantiq/ltq-ptm/src/ifxmips_ptm_vdsl.c
+++ b/package/kernel/lantiq/ltq-ptm/src/ifxmips_ptm_vdsl.c
@@ -1079,7 +1079,7 @@ INIT_PRIV_DATA_FAIL:
     return ret;
 }
 
-static int ltq_ptm_remove(struct platform_device *pdev)
+static void ltq_ptm_remove(struct platform_device *pdev)
 {
     int i;
 	ifx_mei_atm_showtime_enter = NULL;
@@ -1103,8 +1103,6 @@ static int ltq_ptm_remove(struct platform_device *pdev)
     ifx_ptm_uninit_chip();
 
     clear_priv_data();
-
-    return 0;
 }
 
 #ifndef MODULE
@@ -1135,7 +1133,7 @@ static int __init queue_gamma_map_setup(char *line)
 #endif
 static struct platform_driver ltq_ptm_driver = {
 	.probe = ltq_ptm_probe,
-	.remove = ltq_ptm_remove,
+	.remove_new = ltq_ptm_remove,
 	.driver = {
 		.name = "ptm",
 		.of_match_table = ltq_ptm_match,




More information about the lede-commits mailing list