From bd532bd48eca2e37b2afb130e83eb15fb2b330e8 Mon Sep 17 00:00:00 2001 From: Christian Marangi Date: Thu, 10 Apr 2025 21:32:19 +0200 Subject: [PATCH] ltq-adsl-mei: 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/lantiq/ltq-adsl-mei/src/drv_mei_cpe.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/package/kernel/lantiq/ltq-adsl-mei/src/drv_mei_cpe.c b/package/kernel/lantiq/ltq-adsl-mei/src/drv_mei_cpe.c index 20a63716a31..8c976565a00 100644 --- a/package/kernel/lantiq/ltq-adsl-mei/src/drv_mei_cpe.c +++ b/package/kernel/lantiq/ltq-adsl-mei/src/drv_mei_cpe.c @@ -2780,7 +2780,7 @@ static int ltq_mei_probe(struct platform_device *pdev) return 0; } -static int ltq_mei_remove(struct platform_device *pdev) +static void ltq_mei_remove(struct platform_device *pdev) { int i = 0; int num; @@ -2794,7 +2794,6 @@ static int ltq_mei_remove(struct platform_device *pdev) IFX_MEI_ExitDevice (i); } } - return 0; } static const struct of_device_id ltq_mei_match[] = { @@ -2804,7 +2803,7 @@ static const struct of_device_id ltq_mei_match[] = { static struct platform_driver ltq_mei_driver = { .probe = ltq_mei_probe, - .remove = ltq_mei_remove, + .remove_new = ltq_mei_remove, .driver = { .name = "lantiq,mei-xway", .of_match_table = ltq_mei_match,