]> git.ipfire.org Git - thirdparty/openwrt.git/commitdiff
qualcommax: pwm: use remove_new
authorRosen Penev <rosenp@gmail.com>
Sat, 26 Apr 2025 22:46:00 +0000 (15:46 -0700)
committerChristian Marangi <ansuelsmth@gmail.com>
Thu, 1 May 2025 23:34:21 +0000 (01:34 +0200)
Easy compability fix for kernel 6.12.

Signed-off-by: Rosen Penev <rosenp@gmail.com>
Link: https://github.com/openwrt/openwrt/pull/18660
Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>
target/linux/qualcommax/patches-6.6/0141-pwm-driver-for-qualcomm-ipq6018-pwm-block.patch

index 2b7a6d6d891ff6bf1a4a1bebb9eba69005c737b1..bf373c57483424358db268efee360dfb1e446d54 100644 (file)
@@ -51,7 +51,7 @@ Signed-off-by: Devi Priya <quic_devipriy@quicinc.com>
  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 <quic_devipriy@quicinc.com>
 +      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 <quic_devipriy@quicinc.com>
 +              .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);