From 7f02ff45d00d80255e1aa9ac4856d1868f3a8cf0 Mon Sep 17 00:00:00 2001 From: Mieczyslaw Nalewaj Date: Mon, 7 Oct 2024 21:13:27 +0200 Subject: [PATCH] kernel: update packages to be compatible with kernel 6.12 Update kernel packages to be compatible with kernel 6.12. Signed-off-by: Mieczyslaw Nalewaj --- .../kernel/gpio-button-hotplug/src/gpio-button-hotplug.c | 6 ++++++ package/kernel/lantiq/ltq-adsl-mei/src/drv_mei_cpe.c | 6 ++++++ package/kernel/lantiq/ltq-atm/src/ltq_atm.c | 7 ++++++- package/kernel/lantiq/ltq-deu/src/ifxmips_deu.c | 8 +++++++- package/kernel/lantiq/ltq-ptm/src/ifxmips_ptm_adsl.c | 6 ++++++ package/kernel/lantiq/ltq-ptm/src/ifxmips_ptm_vdsl.c | 6 ++++++ package/kernel/ubootenv-nvram/src/ubootenv-nvram.c | 8 ++++++++ 7 files changed, 45 insertions(+), 2 deletions(-) diff --git a/package/kernel/gpio-button-hotplug/src/gpio-button-hotplug.c b/package/kernel/gpio-button-hotplug/src/gpio-button-hotplug.c index 9876dee90f..c8e384b21b 100644 --- a/package/kernel/gpio-button-hotplug/src/gpio-button-hotplug.c +++ b/package/kernel/gpio-button-hotplug/src/gpio-button-hotplug.c @@ -674,7 +674,11 @@ static void gpio_keys_irq_close(struct gpio_keys_button_dev *bdev) } } +#if LINUX_VERSION_CODE < KERNEL_VERSION(6,11,0) static int gpio_keys_remove(struct platform_device *pdev) +#else +static void gpio_keys_remove(struct platform_device *pdev) +#endif { struct gpio_keys_button_dev *bdev = platform_get_drvdata(pdev); @@ -685,7 +689,9 @@ static int gpio_keys_remove(struct platform_device *pdev) else gpio_keys_irq_close(bdev); +#if LINUX_VERSION_CODE < KERNEL_VERSION(6,11,0) return 0; +#endif } static struct platform_driver gpio_keys_driver = { 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 20a63716a3..f6e644a5cf 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,11 @@ static int ltq_mei_probe(struct platform_device *pdev) return 0; } +#if LINUX_VERSION_CODE < KERNEL_VERSION(6,11,0) static int ltq_mei_remove(struct platform_device *pdev) +#else +static void ltq_mei_remove(struct platform_device *pdev) +#endif { int i = 0; int num; @@ -2794,7 +2798,9 @@ static int ltq_mei_remove(struct platform_device *pdev) IFX_MEI_ExitDevice (i); } } +#if LINUX_VERSION_CODE < KERNEL_VERSION(6,11,0) return 0; +#endif } static const struct of_device_id ltq_mei_match[] = { diff --git a/package/kernel/lantiq/ltq-atm/src/ltq_atm.c b/package/kernel/lantiq/ltq-atm/src/ltq_atm.c index 6b1e0321b3..19582ccdbb 100644 --- a/package/kernel/lantiq/ltq-atm/src/ltq_atm.c +++ b/package/kernel/lantiq/ltq-atm/src/ltq_atm.c @@ -41,7 +41,6 @@ #include #include #include -#include #ifdef CONFIG_XFRM #include #endif @@ -1865,7 +1864,11 @@ INIT_PRIV_DATA_FAIL: return ret; } +#if LINUX_VERSION_CODE < KERNEL_VERSION(6,11,0) static int ltq_atm_remove(struct platform_device *pdev) +#else +static void ltq_atm_remove(struct platform_device *pdev) +#endif { int port_num; struct ltq_atm_ops *ops = platform_get_drvdata(pdev); @@ -1886,7 +1889,9 @@ static int ltq_atm_remove(struct platform_device *pdev) clear_priv_data(); +#if LINUX_VERSION_CODE < KERNEL_VERSION(6,11,0) return 0; +#endif } static struct platform_driver ltq_atm_driver = { diff --git a/package/kernel/lantiq/ltq-deu/src/ifxmips_deu.c b/package/kernel/lantiq/ltq-deu/src/ifxmips_deu.c index e44e84c03c..3d43dc9409 100644 --- a/package/kernel/lantiq/ltq-deu/src/ifxmips_deu.c +++ b/package/kernel/lantiq/ltq-deu/src/ifxmips_deu.c @@ -143,7 +143,11 @@ static int ltq_deu_probe(struct platform_device *pdev) * \ingroup IFX_DEU_FUNCTIONS * \brief remove the loaded crypto algorithms */ +#if LINUX_VERSION_CODE < KERNEL_VERSION(6,11,0) static int ltq_deu_remove(struct platform_device *pdev) +#else +static void ltq_deu_remove(struct platform_device *pdev) +#endif { //#ifdef CONFIG_CRYPTO_DEV_PWR_SAVE_MODE #if defined(CONFIG_CRYPTO_DEV_DES) @@ -169,7 +173,9 @@ static int ltq_deu_remove(struct platform_device *pdev) #endif printk("DEU has exited successfully\n"); - return 0; +#if LINUX_VERSION_CODE < KERNEL_VERSION(6,11,0) + return 0; +#endif } 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..dd695a3b84 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,11 @@ INIT_PRIV_DATA_FAIL: * Output: * none */ +#if LINUX_VERSION_CODE < KERNEL_VERSION(6,11,0) static int ltq_ptm_remove(struct platform_device *pdev) +#else +static void ltq_ptm_remove(struct platform_device *pdev) +#endif { int i; @@ -1592,7 +1596,9 @@ static int ltq_ptm_remove(struct platform_device *pdev) clear_priv_data(); +#if LINUX_VERSION_CODE < KERNEL_VERSION(6,11,0) return 0; +#endif } static struct platform_driver ltq_ptm_driver = { 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..0d45d4be10 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,11 @@ INIT_PRIV_DATA_FAIL: return ret; } +#if LINUX_VERSION_CODE < KERNEL_VERSION(6,11,0) static int ltq_ptm_remove(struct platform_device *pdev) +#else +static void ltq_ptm_remove(struct platform_device *pdev) +#endif { int i; ifx_mei_atm_showtime_enter = NULL; @@ -1104,7 +1108,9 @@ static int ltq_ptm_remove(struct platform_device *pdev) clear_priv_data(); +#if LINUX_VERSION_CODE < KERNEL_VERSION(6,11,0) return 0; +#endif } #ifndef MODULE diff --git a/package/kernel/ubootenv-nvram/src/ubootenv-nvram.c b/package/kernel/ubootenv-nvram/src/ubootenv-nvram.c index 106e41231c..bb0138cc90 100644 --- a/package/kernel/ubootenv-nvram/src/ubootenv-nvram.c +++ b/package/kernel/ubootenv-nvram/src/ubootenv-nvram.c @@ -13,6 +13,7 @@ #include #include #include +#include #define NAME "ubootenv" @@ -132,13 +133,20 @@ static int ubootenv_probe(struct platform_device *pdev) return misc_register(&data->misc); } +#if LINUX_VERSION_CODE < KERNEL_VERSION(6,11,0) static int ubootenv_remove(struct platform_device *pdev) +#else +static void ubootenv_remove(struct platform_device *pdev) +#endif { struct ubootenv_drvdata *data = platform_get_drvdata(pdev); data->env = NULL; misc_deregister(&data->misc); + +#if LINUX_VERSION_CODE < KERNEL_VERSION(6,11,0) return 0; +#endif } static struct platform_driver ubootenv_driver = { -- 2.30.2