From d183da890b8a6f03e443cb98cdc9c0f1e1050673 Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Sat, 26 Apr 2025 15:46:00 -0700 Subject: [PATCH] qualcommax: pwm: use remove_new Easy compability fix for kernel 6.12. Signed-off-by: Rosen Penev Link: https://github.com/openwrt/openwrt/pull/18660 Signed-off-by: Christian Marangi --- .../0141-pwm-driver-for-qualcomm-ipq6018-pwm-block.patch | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/target/linux/qualcommax/patches-6.6/0141-pwm-driver-for-qualcomm-ipq6018-pwm-block.patch b/target/linux/qualcommax/patches-6.6/0141-pwm-driver-for-qualcomm-ipq6018-pwm-block.patch index 2b7a6d6d891..bf373c57483 100644 --- a/target/linux/qualcommax/patches-6.6/0141-pwm-driver-for-qualcomm-ipq6018-pwm-block.patch +++ b/target/linux/qualcommax/patches-6.6/0141-pwm-driver-for-qualcomm-ipq6018-pwm-block.patch @@ -51,7 +51,7 @@ Signed-off-by: Devi Priya obj-$(CONFIG_PWM_KEEMBAY) += pwm-keembay.o --- /dev/null +++ b/drivers/pwm/pwm-ipq.c -@@ -0,0 +1,282 @@ +@@ -0,0 +1,280 @@ +// SPDX-License-Identifier: BSD-3-Clause OR GPL-2.0 +/* + * Copyright (c) 2016-2017, 2020 The Linux Foundation. All rights reserved. @@ -306,14 +306,12 @@ Signed-off-by: Devi Priya + return ret; +} + -+static int ipq_pwm_remove(struct platform_device *pdev) ++static void ipq_pwm_remove(struct platform_device *pdev) +{ + struct ipq_pwm_chip *pwm = platform_get_drvdata(pdev); + + pwmchip_remove(&pwm->chip); + clk_disable_unprepare(pwm->clk); -+ -+ return 0; +} + +static const struct of_device_id pwm_ipq_dt_match[] = { @@ -328,7 +326,7 @@ Signed-off-by: Devi Priya + .of_match_table = pwm_ipq_dt_match, + }, + .probe = ipq_pwm_probe, -+ .remove = ipq_pwm_remove, ++ .remove_new = ipq_pwm_remove, +}; + +module_platform_driver(ipq_pwm_driver);