By checking data->pin_ctrl_enable / data->pin_ctrl_hpm flags first, then
use switch-case to improve readability.
Signed-off-by: Axel Lin <[email protected]>
---
drivers/regulator/qcom_spmi-regulator.c | 70 ++++++++++++-------------
1 file changed, 34 insertions(+), 36 deletions(-)
diff --git a/drivers/regulator/qcom_spmi-regulator.c b/drivers/regulator/qcom_spmi-regulator.c
index 5ee7c5305d95..05080483fe1b 100644
--- a/drivers/regulator/qcom_spmi-regulator.c
+++ b/drivers/regulator/qcom_spmi-regulator.c
@@ -1633,45 +1633,43 @@ static int spmi_regulator_init_registers(struct spmi_regulator *vreg,
return ret;
/* Set up enable pin control. */
- if ((type == SPMI_REGULATOR_LOGICAL_TYPE_SMPS
- || type == SPMI_REGULATOR_LOGICAL_TYPE_LDO
- || type == SPMI_REGULATOR_LOGICAL_TYPE_VS)
- && !(data->pin_ctrl_enable
- & SPMI_REGULATOR_PIN_CTRL_ENABLE_HW_DEFAULT)) {
- ctrl_reg[SPMI_COMMON_IDX_ENABLE] &=
- ~SPMI_COMMON_ENABLE_FOLLOW_ALL_MASK;
- ctrl_reg[SPMI_COMMON_IDX_ENABLE] |=
- data->pin_ctrl_enable & SPMI_COMMON_ENABLE_FOLLOW_ALL_MASK;
+ if (!(data->pin_ctrl_enable & SPMI_REGULATOR_PIN_CTRL_ENABLE_HW_DEFAULT)) {
+ switch (type) {
+ case SPMI_REGULATOR_LOGICAL_TYPE_SMPS:
+ case SPMI_REGULATOR_LOGICAL_TYPE_LDO:
+ case SPMI_REGULATOR_LOGICAL_TYPE_VS:
+ ctrl_reg[SPMI_COMMON_IDX_ENABLE] &=
+ ~SPMI_COMMON_ENABLE_FOLLOW_ALL_MASK;
+ ctrl_reg[SPMI_COMMON_IDX_ENABLE] |=
+ data->pin_ctrl_enable & SPMI_COMMON_ENABLE_FOLLOW_ALL_MASK;
+ break;
+ default:
+ break;
+ }
}
/* Set up mode pin control. */
- if ((type == SPMI_REGULATOR_LOGICAL_TYPE_SMPS
- || type == SPMI_REGULATOR_LOGICAL_TYPE_LDO)
- && !(data->pin_ctrl_hpm
- & SPMI_REGULATOR_PIN_CTRL_HPM_HW_DEFAULT)) {
- ctrl_reg[SPMI_COMMON_IDX_MODE] &=
- ~SPMI_COMMON_MODE_FOLLOW_ALL_MASK;
- ctrl_reg[SPMI_COMMON_IDX_MODE] |=
- data->pin_ctrl_hpm & SPMI_COMMON_MODE_FOLLOW_ALL_MASK;
- }
-
- if (type == SPMI_REGULATOR_LOGICAL_TYPE_VS
- && !(data->pin_ctrl_hpm & SPMI_REGULATOR_PIN_CTRL_HPM_HW_DEFAULT)) {
- ctrl_reg[SPMI_COMMON_IDX_MODE] &=
- ~SPMI_COMMON_MODE_FOLLOW_AWAKE_MASK;
- ctrl_reg[SPMI_COMMON_IDX_MODE] |=
- data->pin_ctrl_hpm & SPMI_COMMON_MODE_FOLLOW_AWAKE_MASK;
- }
-
- if ((type == SPMI_REGULATOR_LOGICAL_TYPE_ULT_LO_SMPS
- || type == SPMI_REGULATOR_LOGICAL_TYPE_ULT_HO_SMPS
- || type == SPMI_REGULATOR_LOGICAL_TYPE_ULT_LDO)
- && !(data->pin_ctrl_hpm
- & SPMI_REGULATOR_PIN_CTRL_HPM_HW_DEFAULT)) {
- ctrl_reg[SPMI_COMMON_IDX_MODE] &=
- ~SPMI_COMMON_MODE_FOLLOW_AWAKE_MASK;
- ctrl_reg[SPMI_COMMON_IDX_MODE] |=
- data->pin_ctrl_hpm & SPMI_COMMON_MODE_FOLLOW_AWAKE_MASK;
+ if (!(data->pin_ctrl_hpm & SPMI_REGULATOR_PIN_CTRL_HPM_HW_DEFAULT)) {
+ switch (type) {
+ case SPMI_REGULATOR_LOGICAL_TYPE_SMPS:
+ case SPMI_REGULATOR_LOGICAL_TYPE_LDO:
+ ctrl_reg[SPMI_COMMON_IDX_MODE] &=
+ ~SPMI_COMMON_MODE_FOLLOW_ALL_MASK;
+ ctrl_reg[SPMI_COMMON_IDX_MODE] |=
+ data->pin_ctrl_hpm & SPMI_COMMON_MODE_FOLLOW_ALL_MASK;
+ break;
+ case SPMI_REGULATOR_LOGICAL_TYPE_VS:
+ case SPMI_REGULATOR_LOGICAL_TYPE_ULT_LO_SMPS:
+ case SPMI_REGULATOR_LOGICAL_TYPE_ULT_HO_SMPS:
+ case SPMI_REGULATOR_LOGICAL_TYPE_ULT_LDO:
+ ctrl_reg[SPMI_COMMON_IDX_MODE] &=
+ ~SPMI_COMMON_MODE_FOLLOW_AWAKE_MASK;
+ ctrl_reg[SPMI_COMMON_IDX_MODE] |=
+ data->pin_ctrl_hpm & SPMI_COMMON_MODE_FOLLOW_AWAKE_MASK;
+ break;
+ default:
+ break;
+ }
}
/* Write back any control register values that were modified. */
--
2.25.1
On Fri 31 Jul 22:48 PDT 2020, Axel Lin wrote:
> By checking data->pin_ctrl_enable / data->pin_ctrl_hpm flags first, then
> use switch-case to improve readability.
>
Nice!
Reviewed-by: Bjorn Andersson <[email protected]>
Regards,
Bjorn
> Signed-off-by: Axel Lin <[email protected]>
> ---
> drivers/regulator/qcom_spmi-regulator.c | 70 ++++++++++++-------------
> 1 file changed, 34 insertions(+), 36 deletions(-)
>
> diff --git a/drivers/regulator/qcom_spmi-regulator.c b/drivers/regulator/qcom_spmi-regulator.c
> index 5ee7c5305d95..05080483fe1b 100644
> --- a/drivers/regulator/qcom_spmi-regulator.c
> +++ b/drivers/regulator/qcom_spmi-regulator.c
> @@ -1633,45 +1633,43 @@ static int spmi_regulator_init_registers(struct spmi_regulator *vreg,
> return ret;
>
> /* Set up enable pin control. */
> - if ((type == SPMI_REGULATOR_LOGICAL_TYPE_SMPS
> - || type == SPMI_REGULATOR_LOGICAL_TYPE_LDO
> - || type == SPMI_REGULATOR_LOGICAL_TYPE_VS)
> - && !(data->pin_ctrl_enable
> - & SPMI_REGULATOR_PIN_CTRL_ENABLE_HW_DEFAULT)) {
> - ctrl_reg[SPMI_COMMON_IDX_ENABLE] &=
> - ~SPMI_COMMON_ENABLE_FOLLOW_ALL_MASK;
> - ctrl_reg[SPMI_COMMON_IDX_ENABLE] |=
> - data->pin_ctrl_enable & SPMI_COMMON_ENABLE_FOLLOW_ALL_MASK;
> + if (!(data->pin_ctrl_enable & SPMI_REGULATOR_PIN_CTRL_ENABLE_HW_DEFAULT)) {
> + switch (type) {
> + case SPMI_REGULATOR_LOGICAL_TYPE_SMPS:
> + case SPMI_REGULATOR_LOGICAL_TYPE_LDO:
> + case SPMI_REGULATOR_LOGICAL_TYPE_VS:
> + ctrl_reg[SPMI_COMMON_IDX_ENABLE] &=
> + ~SPMI_COMMON_ENABLE_FOLLOW_ALL_MASK;
> + ctrl_reg[SPMI_COMMON_IDX_ENABLE] |=
> + data->pin_ctrl_enable & SPMI_COMMON_ENABLE_FOLLOW_ALL_MASK;
> + break;
> + default:
> + break;
> + }
> }
>
> /* Set up mode pin control. */
> - if ((type == SPMI_REGULATOR_LOGICAL_TYPE_SMPS
> - || type == SPMI_REGULATOR_LOGICAL_TYPE_LDO)
> - && !(data->pin_ctrl_hpm
> - & SPMI_REGULATOR_PIN_CTRL_HPM_HW_DEFAULT)) {
> - ctrl_reg[SPMI_COMMON_IDX_MODE] &=
> - ~SPMI_COMMON_MODE_FOLLOW_ALL_MASK;
> - ctrl_reg[SPMI_COMMON_IDX_MODE] |=
> - data->pin_ctrl_hpm & SPMI_COMMON_MODE_FOLLOW_ALL_MASK;
> - }
> -
> - if (type == SPMI_REGULATOR_LOGICAL_TYPE_VS
> - && !(data->pin_ctrl_hpm & SPMI_REGULATOR_PIN_CTRL_HPM_HW_DEFAULT)) {
> - ctrl_reg[SPMI_COMMON_IDX_MODE] &=
> - ~SPMI_COMMON_MODE_FOLLOW_AWAKE_MASK;
> - ctrl_reg[SPMI_COMMON_IDX_MODE] |=
> - data->pin_ctrl_hpm & SPMI_COMMON_MODE_FOLLOW_AWAKE_MASK;
> - }
> -
> - if ((type == SPMI_REGULATOR_LOGICAL_TYPE_ULT_LO_SMPS
> - || type == SPMI_REGULATOR_LOGICAL_TYPE_ULT_HO_SMPS
> - || type == SPMI_REGULATOR_LOGICAL_TYPE_ULT_LDO)
> - && !(data->pin_ctrl_hpm
> - & SPMI_REGULATOR_PIN_CTRL_HPM_HW_DEFAULT)) {
> - ctrl_reg[SPMI_COMMON_IDX_MODE] &=
> - ~SPMI_COMMON_MODE_FOLLOW_AWAKE_MASK;
> - ctrl_reg[SPMI_COMMON_IDX_MODE] |=
> - data->pin_ctrl_hpm & SPMI_COMMON_MODE_FOLLOW_AWAKE_MASK;
> + if (!(data->pin_ctrl_hpm & SPMI_REGULATOR_PIN_CTRL_HPM_HW_DEFAULT)) {
> + switch (type) {
> + case SPMI_REGULATOR_LOGICAL_TYPE_SMPS:
> + case SPMI_REGULATOR_LOGICAL_TYPE_LDO:
> + ctrl_reg[SPMI_COMMON_IDX_MODE] &=
> + ~SPMI_COMMON_MODE_FOLLOW_ALL_MASK;
> + ctrl_reg[SPMI_COMMON_IDX_MODE] |=
> + data->pin_ctrl_hpm & SPMI_COMMON_MODE_FOLLOW_ALL_MASK;
> + break;
> + case SPMI_REGULATOR_LOGICAL_TYPE_VS:
> + case SPMI_REGULATOR_LOGICAL_TYPE_ULT_LO_SMPS:
> + case SPMI_REGULATOR_LOGICAL_TYPE_ULT_HO_SMPS:
> + case SPMI_REGULATOR_LOGICAL_TYPE_ULT_LDO:
> + ctrl_reg[SPMI_COMMON_IDX_MODE] &=
> + ~SPMI_COMMON_MODE_FOLLOW_AWAKE_MASK;
> + ctrl_reg[SPMI_COMMON_IDX_MODE] |=
> + data->pin_ctrl_hpm & SPMI_COMMON_MODE_FOLLOW_AWAKE_MASK;
> + break;
> + default:
> + break;
> + }
> }
>
> /* Write back any control register values that were modified. */
> --
> 2.25.1
>
On Sat, 1 Aug 2020 13:48:20 +0800, Axel Lin wrote:
> By checking data->pin_ctrl_enable / data->pin_ctrl_hpm flags first, then
> use switch-case to improve readability.
Applied to
https://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator.git for-next
Thanks!
[1/1] regulator: qcom_spmi: Improve readability for setting up enable/mode pin control
commit: 6a1fe83bf14b87fd8b02f391ea629f69624d9c34
All being well this means that it will be integrated into the linux-next
tree (usually sometime in the next 24 hours) and sent to Linus during
the next merge window (or sooner if it is a bug fix), however if
problems are discovered then the patch may be dropped or reverted.
You may get further e-mails resulting from automated or manual testing
and review of the tree, please engage with people reporting problems and
send followup patches addressing any issues that are reported if needed.
If any updates are required or you are submitting further changes they
should be sent as incremental updates against current git, existing
patches will not be replaced.
Please add any relevant lists and maintainers to the CCs when replying
to this mail.
Thanks,
Mark