Skip to content

Commit 078d830

Browse files
committed
pinctrl: baytrail: Move default strength assignment to a switch-case
When ->pin_config_set() is called from the GPIO library (assumed GpioIo() ACPI resource), the argument can be 1, when, for example, PullDefault is provided. In such case we supply sane default in the driver. Move that default assingment to a switch-case, so it will be consolidated in one place. Reviewed-by: Linus Walleij <[email protected]> Signed-off-by: Andy Shevchenko <[email protected]> Acked-by: Mika Westerberg <[email protected]>
1 parent 5398a0e commit 078d830

File tree

1 file changed

+1
-8
lines changed

1 file changed

+1
-8
lines changed

drivers/pinctrl/intel/pinctrl-baytrail.c

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -810,6 +810,7 @@ static int byt_set_pull_strength(u32 *reg, u16 strength)
810810
*reg &= ~BYT_PULL_STR_MASK;
811811

812812
switch (strength) {
813+
case 1: /* Set default strength value in case none is given */
813814
case 2000:
814815
*reg |= BYT_PULL_STR_2K;
815816
break;
@@ -957,10 +958,6 @@ static int byt_pin_config_set(struct pinctrl_dev *pctl_dev,
957958
conf &= ~BYT_PULL_ASSIGN_MASK;
958959
break;
959960
case PIN_CONFIG_BIAS_PULL_DOWN:
960-
/* Set default strength value in case none is given */
961-
if (arg == 1)
962-
arg = 2000;
963-
964961
byt_gpio_force_input_mode(vg, offset);
965962

966963
conf &= ~BYT_PULL_ASSIGN_MASK;
@@ -969,10 +966,6 @@ static int byt_pin_config_set(struct pinctrl_dev *pctl_dev,
969966

970967
break;
971968
case PIN_CONFIG_BIAS_PULL_UP:
972-
/* Set default strength value in case none is given */
973-
if (arg == 1)
974-
arg = 2000;
975-
976969
byt_gpio_force_input_mode(vg, offset);
977970

978971
conf &= ~BYT_PULL_ASSIGN_MASK;

0 commit comments

Comments
 (0)