Skip to content

Commit 906b545

Browse files
claudiubezneageertu
authored andcommitted
pinctrl: renesas: rzg2l: Move arg and index in the main function block
Move arg and index in the main block of the function as they are used by more than one case block of switch-case (3 out of 4 for arg, 2 out of 4 for index). In this way some lines of code are removed. Signed-off-by: Claudiu Beznea <[email protected]> Reviewed-by: Geert Uytterhoeven <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Geert Uytterhoeven <[email protected]>
1 parent dc99d4c commit 906b545

File tree

1 file changed

+7
-13
lines changed

1 file changed

+7
-13
lines changed

drivers/pinctrl/renesas/pinctrl-rzg2l.c

Lines changed: 7 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -842,7 +842,7 @@ static int rzg2l_pinctrl_pinconf_set(struct pinctrl_dev *pctldev,
842842
struct rzg2l_pinctrl_pin_settings settings = pctrl->settings[_pin];
843843
unsigned int *pin_data = pin->drv_data;
844844
enum pin_config_param param;
845-
unsigned int i;
845+
unsigned int i, arg, index;
846846
u32 cfg, off;
847847
int ret;
848848
u8 bit;
@@ -864,24 +864,21 @@ static int rzg2l_pinctrl_pinconf_set(struct pinctrl_dev *pctldev,
864864
for (i = 0; i < num_configs; i++) {
865865
param = pinconf_to_config_param(_configs[i]);
866866
switch (param) {
867-
case PIN_CONFIG_INPUT_ENABLE: {
868-
unsigned int arg =
869-
pinconf_to_config_argument(_configs[i]);
867+
case PIN_CONFIG_INPUT_ENABLE:
868+
arg = pinconf_to_config_argument(_configs[i]);
870869

871870
if (!(cfg & PIN_CFG_IEN))
872871
return -EINVAL;
873872

874873
rzg2l_rmw_pin_config(pctrl, IEN(off), bit, IEN_MASK, !!arg);
875874
break;
876-
}
877875

878876
case PIN_CONFIG_POWER_SOURCE:
879877
settings.power_source = pinconf_to_config_argument(_configs[i]);
880878
break;
881879

882-
case PIN_CONFIG_DRIVE_STRENGTH: {
883-
unsigned int arg = pinconf_to_config_argument(_configs[i]);
884-
unsigned int index;
880+
case PIN_CONFIG_DRIVE_STRENGTH:
881+
arg = pinconf_to_config_argument(_configs[i]);
885882

886883
if (!(cfg & PIN_CFG_IOLH_A) || hwcfg->drive_strength_ua)
887884
return -EINVAL;
@@ -896,7 +893,6 @@ static int rzg2l_pinctrl_pinconf_set(struct pinctrl_dev *pctldev,
896893

897894
rzg2l_rmw_pin_config(pctrl, IOLH(off), bit, IOLH_MASK, index);
898895
break;
899-
}
900896

901897
case PIN_CONFIG_DRIVE_STRENGTH_UA:
902898
if (!(cfg & (PIN_CFG_IOLH_A | PIN_CFG_IOLH_B | PIN_CFG_IOLH_C)) ||
@@ -906,9 +902,8 @@ static int rzg2l_pinctrl_pinconf_set(struct pinctrl_dev *pctldev,
906902
settings.drive_strength_ua = pinconf_to_config_argument(_configs[i]);
907903
break;
908904

909-
case PIN_CONFIG_OUTPUT_IMPEDANCE_OHMS: {
910-
unsigned int arg = pinconf_to_config_argument(_configs[i]);
911-
unsigned int index;
905+
case PIN_CONFIG_OUTPUT_IMPEDANCE_OHMS:
906+
arg = pinconf_to_config_argument(_configs[i]);
912907

913908
if (!(cfg & PIN_CFG_IOLH_B) || !hwcfg->iolh_groupb_oi[0])
914909
return -EINVAL;
@@ -922,7 +917,6 @@ static int rzg2l_pinctrl_pinconf_set(struct pinctrl_dev *pctldev,
922917

923918
rzg2l_rmw_pin_config(pctrl, IOLH(off), bit, IOLH_MASK, index);
924919
break;
925-
}
926920

927921
default:
928922
return -EOPNOTSUPP;

0 commit comments

Comments
 (0)