pinctrl: renesas: rzg2l: Move arg and index in the main function block

[linux-2.6-microblaze.git] / drivers / pinctrl / renesas / pinctrl-rzg2l.c

diff --git a/drivers/pinctrl/renesas/pinctrl-rzg2l.c b/drivers/pinctrl/renesas/pinctrl-rzg2l.c
index aed59c5..413ef97 100644 (file)
--- a/drivers/pinctrl/renesas/pinctrl-rzg2l.c
+++ b/drivers/pinctrl/renesas/pinctrl-rzg2l.c
@@ -842,7 +842,7 @@ static int rzg2l_pinctrl_pinconf_set(struct pinctrl_dev *pctldev,
        struct rzg2l_pinctrl_pin_settings settings = pctrl->settings[_pin];
        unsigned int *pin_data = pin->drv_data;
        enum pin_config_param param;
-       unsigned int i;
+       unsigned int i, arg, index;
        u32 cfg, off;
        int ret;
        u8 bit;
@@ -864,24 +864,21 @@ static int rzg2l_pinctrl_pinconf_set(struct pinctrl_dev *pctldev,
        for (i = 0; i < num_configs; i++) {
                param = pinconf_to_config_param(_configs[i]);
                switch (param) {
-               case PIN_CONFIG_INPUT_ENABLE: {
-                       unsigned int arg =
-                                       pinconf_to_config_argument(_configs[i]);
+               case PIN_CONFIG_INPUT_ENABLE:
+                       arg = pinconf_to_config_argument(_configs[i]);
 
                        if (!(cfg & PIN_CFG_IEN))
                                return -EINVAL;
 
                        rzg2l_rmw_pin_config(pctrl, IEN(off), bit, IEN_MASK, !!arg);
                        break;
-               }
 
                case PIN_CONFIG_POWER_SOURCE:
                        settings.power_source = pinconf_to_config_argument(_configs[i]);
                        break;
 
-               case PIN_CONFIG_DRIVE_STRENGTH: {
-                       unsigned int arg = pinconf_to_config_argument(_configs[i]);
-                       unsigned int index;
+               case PIN_CONFIG_DRIVE_STRENGTH:
+                       arg = pinconf_to_config_argument(_configs[i]);
 
                        if (!(cfg & PIN_CFG_IOLH_A) || hwcfg->drive_strength_ua)
                                return -EINVAL;
@@ -896,7 +893,6 @@ static int rzg2l_pinctrl_pinconf_set(struct pinctrl_dev *pctldev,
 
                        rzg2l_rmw_pin_config(pctrl, IOLH(off), bit, IOLH_MASK, index);
                        break;
-               }
 
                case PIN_CONFIG_DRIVE_STRENGTH_UA:
                        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,
                        settings.drive_strength_ua = pinconf_to_config_argument(_configs[i]);
                        break;
 
-               case PIN_CONFIG_OUTPUT_IMPEDANCE_OHMS: {
-                       unsigned int arg = pinconf_to_config_argument(_configs[i]);
-                       unsigned int index;
+               case PIN_CONFIG_OUTPUT_IMPEDANCE_OHMS:
+                       arg = pinconf_to_config_argument(_configs[i]);
 
                        if (!(cfg & PIN_CFG_IOLH_B) || !hwcfg->iolh_groupb_oi[0])
                                return -EINVAL;
@@ -922,7 +917,6 @@ static int rzg2l_pinctrl_pinconf_set(struct pinctrl_dev *pctldev,
 
                        rzg2l_rmw_pin_config(pctrl, IOLH(off), bit, IOLH_MASK, index);
                        break;
-               }
 
                default:
                        return -EOPNOTSUPP;