diff options
| author | Robert Marko | 2025-05-09 12:07:20 +0000 |
|---|---|---|
| committer | Robert Marko | 2025-05-16 15:57:40 +0000 |
| commit | 427522d1dece74bee5e64540aacb63f3bffacb3e (patch) | |
| tree | 4345fb888cc6c860836f5d85895c51e10bedfedc | |
| parent | b152f7ba22ec139eefeb613c14bf7c64d2f10f2b (diff) | |
| download | openwrt-427522d1dece74bee5e64540aacb63f3bffacb3e.tar.gz | |
qualcommax: 6.12: cpr: update for 6.12
Remove op is now of a void type and strlcpy was removed.
Link: https://github.com/openwrt/openwrt/pull/18795
Signed-off-by: Robert Marko <robimarko@gmail.com>
| -rw-r--r-- | target/linux/qualcommax/patches-6.12/0901-regulator-add-Qualcomm-CPR-regulators.patch | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/target/linux/qualcommax/patches-6.12/0901-regulator-add-Qualcomm-CPR-regulators.patch b/target/linux/qualcommax/patches-6.12/0901-regulator-add-Qualcomm-CPR-regulators.patch index 0118018597..8da64d2a89 100644 --- a/target/linux/qualcommax/patches-6.12/0901-regulator-add-Qualcomm-CPR-regulators.patch +++ b/target/linux/qualcommax/patches-6.12/0901-regulator-add-Qualcomm-CPR-regulators.patch @@ -741,11 +741,11 @@ Signed-off-by: Robert Marko <robimarko@gmail.com> + return cpr3_open_loop_regulator_register(pdev, ctrl); +} + -+static int cpr3_npu_regulator_remove(struct platform_device *pdev) ++static void cpr3_npu_regulator_remove(struct platform_device *pdev) +{ + struct cpr3_controller *ctrl = platform_get_drvdata(pdev); + -+ return cpr3_open_loop_regulator_unregister(ctrl); ++ cpr3_open_loop_regulator_unregister(ctrl); +} + +static struct platform_driver cpr3_npu_regulator_driver = { @@ -8667,9 +8667,9 @@ Signed-off-by: Robert Marko <robimarko@gmail.com> + return 0; + + if (soc_version_major > 1) -+ strlcpy(prop_name, prop_name_v2, sizeof(prop_name_v2)); ++ strscpy(prop_name, prop_name_v2, sizeof(prop_name_v2)); + else -+ strlcpy(prop_name, prop_name_def, sizeof(prop_name_def)); ++ strscpy(prop_name, prop_name_def, sizeof(prop_name_def)); + + if (!of_find_property(vreg->of_node, prop_name, &len)) { + cpr3_err(vreg, "property %s is missing\n", prop_name); @@ -8718,7 +8718,7 @@ Signed-off-by: Robert Marko <robimarko@gmail.com> + "qcom,cpr-cold-temp-voltage-adjustment-%d", + vreg->part_type); + } else { -+ strlcpy(prop_str, "qcom,cpr-cold-temp-voltage-adjustment", ++ strscpy(prop_str, "qcom,cpr-cold-temp-voltage-adjustment", + sizeof(prop_str)); + } + @@ -8773,10 +8773,10 @@ Signed-off-by: Robert Marko <robimarko@gmail.com> + BUG_ON(soc_version_major <= 0); + + if (soc_version_major > 1) -+ strlcpy(prop_str, "qcom,cpr-cold-temp-threshold-v2", ++ strscpy(prop_str, "qcom,cpr-cold-temp-threshold-v2", + sizeof(prop_str)); + else -+ strlcpy(prop_str, "qcom,cpr-cold-temp-threshold", ++ strscpy(prop_str, "qcom,cpr-cold-temp-threshold", + sizeof(prop_str)); + + if (!of_find_property(vreg->of_node, prop_str, NULL)) { @@ -8816,15 +8816,15 @@ Signed-off-by: Robert Marko <robimarko@gmail.com> + "qcom,cpr-cold-temp-voltage-adjustment-%d", + vreg->part_type); + } else { -+ strlcpy(req_prop_str, "qcom,cpr-cold-temp-voltage-adjustment", ++ strscpy(req_prop_str, "qcom,cpr-cold-temp-voltage-adjustment", + sizeof(req_prop_str)); + } + + if (soc_version_major > 1) -+ strlcpy(prop_str, "qcom,cpr-cold-temp-threshold-v2", ++ strscpy(prop_str, "qcom,cpr-cold-temp-threshold-v2", + sizeof(prop_str)); + else -+ strlcpy(prop_str, "qcom,cpr-cold-temp-threshold", ++ strscpy(prop_str, "qcom,cpr-cold-temp-threshold", + sizeof(prop_str)); + + if (!of_find_property(vreg->of_node, req_prop_str, NULL)) { @@ -8882,7 +8882,7 @@ Signed-off-by: Robert Marko <robimarko@gmail.com> + "qcom,cpr-open-loop-voltage-fuse-adjustment-%d", + vreg->part_type); + } else { -+ strlcpy(prop_str, "qcom,cpr-open-loop-voltage-fuse-adjustment", ++ strscpy(prop_str, "qcom,cpr-open-loop-voltage-fuse-adjustment", + sizeof(prop_str)); + } + @@ -11651,11 +11651,11 @@ Signed-off-by: Robert Marko <robimarko@gmail.com> + return cpr3_regulator_register(pdev, ctrl); +} + -+static int cpr4_apss_regulator_remove(struct platform_device *pdev) ++static void cpr4_apss_regulator_remove(struct platform_device *pdev) +{ + struct cpr3_controller *ctrl = platform_get_drvdata(pdev); + -+ return cpr3_regulator_unregister(ctrl); ++ cpr3_regulator_unregister(ctrl); +} + +static struct platform_driver cpr4_apss_regulator_driver = { |