regulator: cpr3-regulator: correct various coding style issues

Correct warnings flagged by checkpatch.  In particular, modify
the following:

 - Use octal file permissions instead of symbolic.

 - Add 'const' to type of struct of_device_id variables.

 - Remove unnecessary out-of-memory error messages.

 - Change variables of type 'unsigned' to 'unsigned int'.

 - Restructure conditionals to avoid else after return/break.

 - Remove 'return' from the end of void functions.

 - Correct minor whitespace inconsistencies.

Change-Id: Ibf7812cd722c74e48d51e765f00efcbcf548c552
Signed-off-by: David Collins <collinsd@codeaurora.org>

6 files changed, 52 insertions, 56 deletions

diff --git a/drivers/regulator/cpr3-hmss-regulator.c b/drivers/regulator/cpr3-hmss-regulator.c
index 091780525207..77e8bf4b9895 100644
--- a/drivers/regulator/cpr3-hmss-regulator.c
+++ b/drivers/regulator/cpr3-hmss-regulator.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015-2016, The Linux Foundation. All rights reserved.
+ * Copyright (c) 2015-2017, The Linux Foundation. All rights reserved.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 and
@@ -1232,7 +1232,7 @@ static int cpr3_hmss_kvreg_init(struct cpr3_regulator *vreg)
 	scnprintf(kvreg_name_buf, MAX_VREG_NAME_SIZE,
 		"vdd-thread%d-ldo-supply", id);
 
-	if (!of_find_property(ctrl->dev->of_node, kvreg_name_buf , NULL))
+	if (!of_find_property(ctrl->dev->of_node, kvreg_name_buf, NULL))
 		return 0;
 	else if (!of_find_property(node, "qcom,ldo-min-headroom-voltage", NULL))
 		return 0;
@@ -1675,7 +1675,7 @@ static int cpr3_hmss_regulator_resume(struct platform_device *pdev)
 }
 
 /* Data corresponds to the SoC revision */
-static struct of_device_id cpr_regulator_match_table[] = {
+static const struct of_device_id cpr_regulator_match_table[] = {
 	{
 		.compatible = "qcom,cpr3-msm8996-v1-hmss-regulator",
 		.data = (void *)(uintptr_t)1
diff --git a/drivers/regulator/cpr3-mmss-regulator.c b/drivers/regulator/cpr3-mmss-regulator.c
index 1070a34073e4..41032dd3c15a 100644
--- a/drivers/regulator/cpr3-mmss-regulator.c
+++ b/drivers/regulator/cpr3-mmss-regulator.c
@@ -1088,7 +1088,7 @@ static int cpr3_mmss_regulator_resume(struct platform_device *pdev)
 }
 
 /* Data corresponds to the SoC revision */
-static struct of_device_id cpr_regulator_match_table[] = {
+static const struct of_device_id cpr_regulator_match_table[] = {
 	{
 		.compatible = "qcom,cpr3-msm8996-v1-mmss-regulator",
 		.data = (void *)(uintptr_t)1,
diff --git a/drivers/regulator/cpr3-regulator.c b/drivers/regulator/cpr3-regulator.c
index 6775152f2623..c51ed182ba96 100644
--- a/drivers/regulator/cpr3-regulator.c
+++ b/drivers/regulator/cpr3-regulator.c
@@ -1622,8 +1622,6 @@ static void cpr3_regulator_set_target_quot(struct cpr3_thread *thread)
 	}
 
 	thread->last_closed_loop_aggr_corner = thread->aggr_corner;
-
-	return;
 }
 
 /**
@@ -1647,8 +1645,8 @@ static void cpr3_update_vreg_closed_loop_volt(struct cpr3_regulator *vreg,
 
 	if (vreg->last_closed_loop_corner == CPR3_REGULATOR_CORNER_INVALID)
 		return;
-	else
-		corner = &vreg->corner[vreg->last_closed_loop_corner];
+
+	corner = &vreg->corner[vreg->last_closed_loop_corner];
 
 	if (vreg->thread->last_closed_loop_aggr_corner.ro_mask
 	    == CPR3_RO_MASK  || !vreg->aggregated) {
@@ -4195,7 +4193,7 @@ static int cpr3_regulator_update_ctrl_state(struct cpr3_controller *ctrl)
  * Return: 0 on success, errno on failure
  */
 static int cpr3_regulator_set_voltage(struct regulator_dev *rdev,
-		int corner, int corner_max, unsigned *selector)
+		int corner, int corner_max, unsigned int *selector)
 {
 	struct cpr3_regulator *vreg = rdev_get_drvdata(rdev);
 	struct cpr3_controller *ctrl = vreg->thread->ctrl;
@@ -4264,7 +4262,7 @@ static int cpr3_regulator_get_voltage(struct regulator_dev *rdev)
  * Return: voltage corner value offset by CPR3_CORNER_OFFSET
  */
 static int cpr3_regulator_list_voltage(struct regulator_dev *rdev,
-		unsigned selector)
+		unsigned int selector)
 {
 	struct cpr3_regulator *vreg = rdev_get_drvdata(rdev);
 
@@ -4964,11 +4962,11 @@ static struct dentry *debugfs_create_int(const char *name, umode_t mode,
 				struct dentry *parent, int *value)
 {
 	/* if there are no write bits set, make read only */
-	if (!(mode & S_IWUGO))
+	if (!(mode & 0222))
 		return debugfs_create_file(name, mode, parent, value,
 					   &fops_int_ro);
 	/* if there are no read bits set, make write only */
-	if (!(mode & S_IRUGO))
+	if (!(mode & 0444))
 		return debugfs_create_file(name, mode, parent, value,
 					   &fops_int_wo);
 
@@ -5225,21 +5223,21 @@ static void cpr3_regulator_debugfs_corner_add(struct cpr3_regulator *vreg,
 	struct cpr3_debug_corner_info *info;
 	struct dentry *temp;
 
-	temp = cpr3_debugfs_create_corner_int(vreg, "floor_volt", S_IRUGO,
+	temp = cpr3_debugfs_create_corner_int(vreg, "floor_volt", 0444,
 		corner_dir, index, offsetof(struct cpr3_corner, floor_volt));
 	if (IS_ERR_OR_NULL(temp)) {
 		cpr3_err(vreg, "floor_volt debugfs file creation failed\n");
 		return;
 	}
 
-	temp = cpr3_debugfs_create_corner_int(vreg, "ceiling_volt", S_IRUGO,
+	temp = cpr3_debugfs_create_corner_int(vreg, "ceiling_volt", 0444,
 		corner_dir, index, offsetof(struct cpr3_corner, ceiling_volt));
 	if (IS_ERR_OR_NULL(temp)) {
 		cpr3_err(vreg, "ceiling_volt debugfs file creation failed\n");
 		return;
 	}
 
-	temp = cpr3_debugfs_create_corner_int(vreg, "open_loop_volt", S_IRUGO,
+	temp = cpr3_debugfs_create_corner_int(vreg, "open_loop_volt", 0444,
 		corner_dir, index,
 		offsetof(struct cpr3_corner, open_loop_volt));
 	if (IS_ERR_OR_NULL(temp)) {
@@ -5247,7 +5245,7 @@ static void cpr3_regulator_debugfs_corner_add(struct cpr3_regulator *vreg,
 		return;
 	}
 
-	temp = cpr3_debugfs_create_corner_int(vreg, "last_volt", S_IRUGO,
+	temp = cpr3_debugfs_create_corner_int(vreg, "last_volt", 0444,
 		corner_dir, index, offsetof(struct cpr3_corner, last_volt));
 	if (IS_ERR_OR_NULL(temp)) {
 		cpr3_err(vreg, "last_volt debugfs file creation failed\n");
@@ -5262,8 +5260,8 @@ static void cpr3_regulator_debugfs_corner_add(struct cpr3_regulator *vreg,
 	info->index = index;
 	info->corner = vreg->corner;
 
-	temp = debugfs_create_file("target_quots", S_IRUGO, corner_dir,
-				info, &cpr3_debug_quot_fops);
+	temp = debugfs_create_file("target_quots", 0444, corner_dir, info,
+				&cpr3_debug_quot_fops);
 	if (IS_ERR_OR_NULL(temp)) {
 		cpr3_err(vreg, "target_quots debugfs file creation failed\n");
 		return;
@@ -5361,21 +5359,21 @@ static void cpr3_regulator_debugfs_vreg_add(struct cpr3_regulator *vreg,
 		return;
 	}
 
-	temp = debugfs_create_int("speed_bin_fuse", S_IRUGO, vreg_dir,
+	temp = debugfs_create_int("speed_bin_fuse", 0444, vreg_dir,
 				  &vreg->speed_bin_fuse);
 	if (IS_ERR_OR_NULL(temp)) {
 		cpr3_err(vreg, "speed_bin_fuse debugfs file creation failed\n");
 		return;
 	}
 
-	temp = debugfs_create_int("cpr_rev_fuse", S_IRUGO, vreg_dir,
+	temp = debugfs_create_int("cpr_rev_fuse", 0444, vreg_dir,
 				  &vreg->cpr_rev_fuse);
 	if (IS_ERR_OR_NULL(temp)) {
 		cpr3_err(vreg, "cpr_rev_fuse debugfs file creation failed\n");
 		return;
 	}
 
-	temp = debugfs_create_int("fuse_combo", S_IRUGO, vreg_dir,
+	temp = debugfs_create_int("fuse_combo", 0444, vreg_dir,
 				  &vreg->fuse_combo);
 	if (IS_ERR_OR_NULL(temp)) {
 		cpr3_err(vreg, "fuse_combo debugfs file creation failed\n");
@@ -5383,15 +5381,15 @@ static void cpr3_regulator_debugfs_vreg_add(struct cpr3_regulator *vreg,
 	}
 
 	if (vreg->ldo_regulator) {
-		temp = debugfs_create_file("ldo_mode", S_IRUGO, vreg_dir,
-				vreg, &cpr3_debug_ldo_mode_fops);
+		temp = debugfs_create_file("ldo_mode", 0444, vreg_dir, vreg,
+					&cpr3_debug_ldo_mode_fops);
 		if (IS_ERR_OR_NULL(temp)) {
 			cpr3_err(vreg, "ldo_mode debugfs file creation failed\n");
 			return;
 		}
 
 		temp = debugfs_create_file("ldo_mode_allowed",
-				S_IRUGO | S_IWUSR, vreg_dir, vreg,
+				0644, vreg_dir, vreg,
 				&cpr3_debug_ldo_mode_allowed_fops);
 		if (IS_ERR_OR_NULL(temp)) {
 			cpr3_err(vreg, "ldo_mode_allowed debugfs file creation failed\n");
@@ -5399,7 +5397,7 @@ static void cpr3_regulator_debugfs_vreg_add(struct cpr3_regulator *vreg,
 		}
 	}
 
-	temp = debugfs_create_int("corner_count", S_IRUGO, vreg_dir,
+	temp = debugfs_create_int("corner_count", 0444, vreg_dir,
 				  &vreg->corner_count);
 	if (IS_ERR_OR_NULL(temp)) {
 		cpr3_err(vreg, "corner_count debugfs file creation failed\n");
@@ -5412,8 +5410,8 @@ static void cpr3_regulator_debugfs_vreg_add(struct cpr3_regulator *vreg,
 		return;
 	}
 
-	temp = debugfs_create_file("index", S_IRUGO | S_IWUSR, corner_dir,
-				vreg, &cpr3_debug_corner_index_fops);
+	temp = debugfs_create_file("index", 0644, corner_dir, vreg,
+				&cpr3_debug_corner_index_fops);
 	if (IS_ERR_OR_NULL(temp)) {
 		cpr3_err(vreg, "index debugfs file creation failed\n");
 		return;
@@ -5428,8 +5426,8 @@ static void cpr3_regulator_debugfs_vreg_add(struct cpr3_regulator *vreg,
 		return;
 	}
 
-	temp = debugfs_create_file("index", S_IRUGO, corner_dir,
-				vreg, &cpr3_debug_current_corner_index_fops);
+	temp = debugfs_create_file("index", 0444, corner_dir, vreg,
+				&cpr3_debug_current_corner_index_fops);
 	if (IS_ERR_OR_NULL(temp)) {
 		cpr3_err(vreg, "index debugfs file creation failed\n");
 		return;
@@ -5470,7 +5468,7 @@ static void cpr3_regulator_debugfs_thread_add(struct cpr3_thread *thread)
 		return;
 	}
 
-	temp = debugfs_create_int("floor_volt", S_IRUGO, aggr_dir,
+	temp = debugfs_create_int("floor_volt", 0444, aggr_dir,
 				  &thread->aggr_corner.floor_volt);
 	if (IS_ERR_OR_NULL(temp)) {
 		cpr3_err(ctrl, "thread %u aggr floor_volt debugfs file creation failed\n",
@@ -5478,7 +5476,7 @@ static void cpr3_regulator_debugfs_thread_add(struct cpr3_thread *thread)
 		return;
 	}
 
-	temp = debugfs_create_int("ceiling_volt", S_IRUGO, aggr_dir,
+	temp = debugfs_create_int("ceiling_volt", 0444, aggr_dir,
 				  &thread->aggr_corner.ceiling_volt);
 	if (IS_ERR_OR_NULL(temp)) {
 		cpr3_err(ctrl, "thread %u aggr ceiling_volt debugfs file creation failed\n",
@@ -5486,7 +5484,7 @@ static void cpr3_regulator_debugfs_thread_add(struct cpr3_thread *thread)
 		return;
 	}
 
-	temp = debugfs_create_int("open_loop_volt", S_IRUGO, aggr_dir,
+	temp = debugfs_create_int("open_loop_volt", 0444, aggr_dir,
 				  &thread->aggr_corner.open_loop_volt);
 	if (IS_ERR_OR_NULL(temp)) {
 		cpr3_err(ctrl, "thread %u aggr open_loop_volt debugfs file creation failed\n",
@@ -5494,7 +5492,7 @@ static void cpr3_regulator_debugfs_thread_add(struct cpr3_thread *thread)
 		return;
 	}
 
-	temp = debugfs_create_int("last_volt", S_IRUGO, aggr_dir,
+	temp = debugfs_create_int("last_volt", 0444, aggr_dir,
 				  &thread->aggr_corner.last_volt);
 	if (IS_ERR_OR_NULL(temp)) {
 		cpr3_err(ctrl, "thread %u aggr last_volt debugfs file creation failed\n",
@@ -5511,8 +5509,8 @@ static void cpr3_regulator_debugfs_thread_add(struct cpr3_thread *thread)
 	info->index = index;
 	info->corner = &thread->aggr_corner;
 
-	temp = debugfs_create_file("target_quots", S_IRUGO, aggr_dir,
-				info, &cpr3_debug_quot_fops);
+	temp = debugfs_create_file("target_quots", 0444, aggr_dir, info,
+				&cpr3_debug_quot_fops);
 	if (IS_ERR_OR_NULL(temp)) {
 		cpr3_err(ctrl, "thread %u target_quots debugfs file creation failed\n",
 			thread->thread_id);
@@ -5869,7 +5867,7 @@ static void cpr3_regulator_debugfs_ctrl_add(struct cpr3_controller *ctrl)
 		return;
 	}
 
-	temp = debugfs_create_file("cpr_closed_loop_enable", S_IRUGO | S_IWUSR,
+	temp = debugfs_create_file("cpr_closed_loop_enable", 0644,
 					ctrl->debugfs, ctrl,
 					&cpr3_debug_closed_loop_enable_fops);
 	if (IS_ERR_OR_NULL(temp)) {
@@ -5878,8 +5876,8 @@ static void cpr3_regulator_debugfs_ctrl_add(struct cpr3_controller *ctrl)
 	}
 
 	if (ctrl->supports_hw_closed_loop) {
-		temp = debugfs_create_file("use_hw_closed_loop",
-					S_IRUGO | S_IWUSR, ctrl->debugfs, ctrl,
+		temp = debugfs_create_file("use_hw_closed_loop", 0644,
+					ctrl->debugfs, ctrl,
 					&cpr3_debug_hw_closed_loop_enable_fops);
 		if (IS_ERR_OR_NULL(temp)) {
 			cpr3_err(ctrl, "use_hw_closed_loop debugfs file creation failed\n");
@@ -5887,7 +5885,7 @@ static void cpr3_regulator_debugfs_ctrl_add(struct cpr3_controller *ctrl)
 		}
 	}
 
-	temp = debugfs_create_int("thread_count", S_IRUGO, ctrl->debugfs,
+	temp = debugfs_create_int("thread_count", 0444, ctrl->debugfs,
 				  &ctrl->thread_count);
 	if (IS_ERR_OR_NULL(temp)) {
 		cpr3_err(ctrl, "thread_count debugfs file creation failed\n");
@@ -5895,7 +5893,7 @@ static void cpr3_regulator_debugfs_ctrl_add(struct cpr3_controller *ctrl)
 	}
 
 	if (ctrl->apm) {
-		temp = debugfs_create_int("apm_threshold_volt", S_IRUGO,
+		temp = debugfs_create_int("apm_threshold_volt", 0444,
 				ctrl->debugfs, &ctrl->apm_threshold_volt);
 		if (IS_ERR_OR_NULL(temp)) {
 			cpr3_err(ctrl, "apm_threshold_volt debugfs file creation failed\n");
@@ -5905,28 +5903,28 @@ static void cpr3_regulator_debugfs_ctrl_add(struct cpr3_controller *ctrl)
 
 	if (ctrl->aging_required || ctrl->aging_succeeded
 	    || ctrl->aging_failed) {
-		temp = debugfs_create_int("aging_adj_volt", S_IRUGO,
+		temp = debugfs_create_int("aging_adj_volt", 0444,
 				ctrl->debugfs, &ctrl->aging_ref_adjust_volt);
 		if (IS_ERR_OR_NULL(temp)) {
 			cpr3_err(ctrl, "aging_adj_volt debugfs file creation failed\n");
 			return;
 		}
 
-		temp = debugfs_create_file("aging_succeeded", S_IRUGO,
+		temp = debugfs_create_file("aging_succeeded", 0444,
 			ctrl->debugfs, &ctrl->aging_succeeded, &fops_bool_ro);
 		if (IS_ERR_OR_NULL(temp)) {
 			cpr3_err(ctrl, "aging_succeeded debugfs file creation failed\n");
 			return;
 		}
 
-		temp = debugfs_create_file("aging_failed", S_IRUGO,
+		temp = debugfs_create_file("aging_failed", 0444,
 			ctrl->debugfs, &ctrl->aging_failed, &fops_bool_ro);
 		if (IS_ERR_OR_NULL(temp)) {
 			cpr3_err(ctrl, "aging_failed debugfs file creation failed\n");
 			return;
 		}
 
-		temp = debugfs_create_file("aging_trigger", S_IWUSR,
+		temp = debugfs_create_file("aging_trigger", 0200,
 			ctrl->debugfs, ctrl,
 			&cpr3_debug_trigger_aging_measurement_fops);
 		if (IS_ERR_OR_NULL(temp)) {
@@ -5941,28 +5939,28 @@ static void cpr3_regulator_debugfs_ctrl_add(struct cpr3_controller *ctrl)
 		return;
 	}
 
-	temp = debugfs_create_int("floor_volt", S_IRUGO, aggr_dir,
+	temp = debugfs_create_int("floor_volt", 0444, aggr_dir,
 				  &ctrl->aggr_corner.floor_volt);
 	if (IS_ERR_OR_NULL(temp)) {
 		cpr3_err(ctrl, "aggr floor_volt debugfs file creation failed\n");
 		return;
 	}
 
-	temp = debugfs_create_int("ceiling_volt", S_IRUGO, aggr_dir,
+	temp = debugfs_create_int("ceiling_volt", 0444, aggr_dir,
 				  &ctrl->aggr_corner.ceiling_volt);
 	if (IS_ERR_OR_NULL(temp)) {
 		cpr3_err(ctrl, "aggr ceiling_volt debugfs file creation failed\n");
 		return;
 	}
 
-	temp = debugfs_create_int("open_loop_volt", S_IRUGO, aggr_dir,
+	temp = debugfs_create_int("open_loop_volt", 0444, aggr_dir,
 				  &ctrl->aggr_corner.open_loop_volt);
 	if (IS_ERR_OR_NULL(temp)) {
 		cpr3_err(ctrl, "aggr open_loop_volt debugfs file creation failed\n");
 		return;
 	}
 
-	temp = debugfs_create_int("last_volt", S_IRUGO, aggr_dir,
+	temp = debugfs_create_int("last_volt", 0444, aggr_dir,
 				  &ctrl->aggr_corner.last_volt);
 	if (IS_ERR_OR_NULL(temp)) {
 		cpr3_err(ctrl, "aggr last_volt debugfs file creation failed\n");
diff --git a/drivers/regulator/cpr3-regulator.h b/drivers/regulator/cpr3-regulator.h
index f0230b8ae2e5..7dae23ca0e70 100644
--- a/drivers/regulator/cpr3-regulator.h
+++ b/drivers/regulator/cpr3-regulator.h
@@ -36,9 +36,9 @@ struct cpr3_thread;
  * from 0 to 63.  bit_start must be less than or equal to bit_end.
  */
 struct cpr3_fuse_param {
-	unsigned		row;
-	unsigned		bit_start;
-	unsigned		bit_end;
+	unsigned int		row;
+	unsigned int		bit_start;
+	unsigned int		bit_end;
 };
 
 /* Each CPR3 sensor has 16 ring oscillators */
@@ -1021,7 +1021,6 @@ static inline int cpr3_limit_open_loop_voltages(struct cpr3_regulator *vreg)
 static inline void cpr3_open_loop_voltage_as_ceiling(
 			struct cpr3_regulator *vreg)
 {
-	return;
 }
 
 static inline int cpr3_limit_floor_voltages(struct cpr3_regulator *vreg)
@@ -1031,7 +1030,6 @@ static inline int cpr3_limit_floor_voltages(struct cpr3_regulator *vreg)
 
 static inline void cpr3_print_quots(struct cpr3_regulator *vreg)
 {
-	return;
 }
 
 static inline int cpr3_adjust_fused_open_loop_voltages(
diff --git a/drivers/regulator/cpr4-apss-regulator.c b/drivers/regulator/cpr4-apss-regulator.c
index 737511e250f1..cfc09ba9f8da 100644
--- a/drivers/regulator/cpr4-apss-regulator.c
+++ b/drivers/regulator/cpr4-apss-regulator.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015-2016, The Linux Foundation. All rights reserved.
+ * Copyright (c) 2015-2017, The Linux Foundation. All rights reserved.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 and
@@ -1402,7 +1402,7 @@ static int cpr4_apss_regulator_remove(struct platform_device *pdev)
 	return cpr3_regulator_unregister(ctrl);
 }
 
-static struct of_device_id cpr4_regulator_match_table[] = {
+static const struct of_device_id cpr4_regulator_match_table[] = {
 	{ .compatible = "qcom,cpr4-msm8953-apss-regulator", },
 	{}
 };
diff --git a/drivers/regulator/cprh-kbss-regulator.c b/drivers/regulator/cprh-kbss-regulator.c
index 0472ce13197b..f21800e00d80 100644
--- a/drivers/regulator/cprh-kbss-regulator.c
+++ b/drivers/regulator/cprh-kbss-regulator.c
@@ -2007,7 +2007,7 @@ static int cprh_kbss_regulator_resume(struct platform_device *pdev)
 }
 
 /* Data corresponds to the SoC revision */
-static struct of_device_id cprh_regulator_match_table[] = {
+static const struct of_device_id cprh_regulator_match_table[] = {
 	{
 		.compatible =  "qcom,cprh-msm8998-v1-kbss-regulator",
 		.data = (void *)(uintptr_t)MSM8998_V1_SOC_ID,