|
|
@@ -741,11 +741,11 @@ Signed-off-by: Robert Marko <[email protected]>
|
|
|
+ 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 <[email protected]>
|
|
|
+ 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 <[email protected]>
|
|
|
+ "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 <[email protected]>
|
|
|
+ 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 <[email protected]>
|
|
|
+ "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 <[email protected]>
|
|
|
+ "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 <[email protected]>
|
|
|
+ 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 = {
|