pinctrl: intel: Deduplicate some code in intel_config_set_pull()

First part is to assign default argument for all cases, since
bias disablement doesn't use it anyway.

Second part is to clear all bits in the bias setting and
depending on the argument and parameter set them as asked.

While at it, add break statement to the default cases.

Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Acked-by: Mika Westerberg <mika.westerberg@linux.intel.com>

diff --git a/drivers/pinctrl/intel/pinctrl-intel.c b/drivers/pinctrl/intel/pinctrl-intel.c
index 4b1d5a2..4a0f741 100644 (file)
--- a/drivers/pinctrl/intel/pinctrl-intel.c
+++ b/drivers/pinctrl/intel/pinctrl-intel.c
@@ -691,21 +691,17 @@ static int intel_config_set_pull(struct intel_pinctrl *pctrl, unsigned int pin,
        raw_spin_lock_irqsave(&pctrl->lock, flags);
 
        value = readl(padcfg1);
+       value &= ~(PADCFG1_TERM_MASK | PADCFG1_TERM_UP);
+
+       /* Set default strength value in case none is given */
+       if (arg == 1)
+               arg = 5000;
 
        switch (param) {
        case PIN_CONFIG_BIAS_DISABLE:
-               value &= ~(PADCFG1_TERM_MASK | PADCFG1_TERM_UP);
                break;
 
        case PIN_CONFIG_BIAS_PULL_UP:
-               value &= ~PADCFG1_TERM_MASK;
-
-               value |= PADCFG1_TERM_UP;
-
-               /* Set default strength value in case none is given */
-               if (arg == 1)
-                       arg = 5000;
-
                switch (arg) {
                case 20000:
                        value |= PADCFG1_TERM_20K << PADCFG1_TERM_SHIFT;
@@ -721,17 +717,13 @@ static int intel_config_set_pull(struct intel_pinctrl *pctrl, unsigned int pin,
                        break;
                default:
                        ret = -EINVAL;
+                       break;
                }
 
+               value |= PADCFG1_TERM_UP;
                break;
 
        case PIN_CONFIG_BIAS_PULL_DOWN:
-               value &= ~(PADCFG1_TERM_UP | PADCFG1_TERM_MASK);
-
-               /* Set default strength value in case none is given */
-               if (arg == 1)
-                       arg = 5000;
-
                switch (arg) {
                case 20000:
                        value |= PADCFG1_TERM_20K << PADCFG1_TERM_SHIFT;
@@ -755,6 +747,7 @@ static int intel_config_set_pull(struct intel_pinctrl *pctrl, unsigned int pin,
                        break;
                default:
                        ret = -EINVAL;
+                       break;
                }
 
                break;