diff options
| author | Christian Marangi | 2025-04-10 19:34:41 +0000 |
|---|---|---|
| committer | Christian Marangi | 2025-04-11 09:21:20 +0000 |
| commit | 83286b911ebd05f64f25a390769bf38c38dbeb73 (patch) | |
| tree | 47d390432bdad2a67c6b95b1132db4849387e0f1 | |
| parent | 0432866d1f97bd9ee2e2b59671b381d74f58f770 (diff) | |
| download | openwrt-83286b911ebd05f64f25a390769bf38c38dbeb73.tar.gz | |
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@gmail.com>
| -rw-r--r-- | package/kernel/lantiq/ltq-ptm/src/ifxmips_ptm_adsl.c | 6 | ||||
| -rw-r--r-- | 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, |