소스 검색

qualcommax: pwm: use remove_new

Easy compability fix for kernel 6.12.

Signed-off-by: Rosen Penev <[email protected]>
Link: https://github.com/openwrt/openwrt/pull/18660
Signed-off-by: Christian Marangi <[email protected]>
Rosen Penev 8 달 전
부모
커밋
d183da890b
1개의 변경된 파일3개의 추가작업 그리고 5개의 파일을 삭제
  1. 3 5
      target/linux/qualcommax/patches-6.6/0141-pwm-driver-for-qualcomm-ipq6018-pwm-block.patch

+ 3 - 5
target/linux/qualcommax/patches-6.6/0141-pwm-driver-for-qualcomm-ipq6018-pwm-block.patch

@@ -51,7 +51,7 @@ Signed-off-by: Devi Priya <[email protected]>
  obj-$(CONFIG_PWM_KEEMBAY)	+= pwm-keembay.o
  obj-$(CONFIG_PWM_KEEMBAY)	+= pwm-keembay.o
 --- /dev/null
 --- /dev/null
 +++ b/drivers/pwm/pwm-ipq.c
 +++ b/drivers/pwm/pwm-ipq.c
-@@ -0,0 +1,282 @@
+@@ -0,0 +1,280 @@
 +// SPDX-License-Identifier: BSD-3-Clause OR GPL-2.0
 +// SPDX-License-Identifier: BSD-3-Clause OR GPL-2.0
 +/*
 +/*
 + * Copyright (c) 2016-2017, 2020 The Linux Foundation. All rights reserved.
 + * Copyright (c) 2016-2017, 2020 The Linux Foundation. All rights reserved.
@@ -306,14 +306,12 @@ Signed-off-by: Devi Priya <[email protected]>
 +	return ret;
 +	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);
 +	struct ipq_pwm_chip *pwm = platform_get_drvdata(pdev);
 +
 +
 +	pwmchip_remove(&pwm->chip);
 +	pwmchip_remove(&pwm->chip);
 +	clk_disable_unprepare(pwm->clk);
 +	clk_disable_unprepare(pwm->clk);
-+
-+	return 0;
 +}
 +}
 +
 +
 +static const struct of_device_id pwm_ipq_dt_match[] = {
 +static const struct of_device_id pwm_ipq_dt_match[] = {
@@ -328,7 +326,7 @@ Signed-off-by: Devi Priya <[email protected]>
 +		.of_match_table = pwm_ipq_dt_match,
 +		.of_match_table = pwm_ipq_dt_match,
 +	},
 +	},
 +	.probe = ipq_pwm_probe,
 +	.probe = ipq_pwm_probe,
-+	.remove = ipq_pwm_remove,
++	.remove_new = ipq_pwm_remove,
 +};
 +};
 +
 +
 +module_platform_driver(ipq_pwm_driver);
 +module_platform_driver(ipq_pwm_driver);