Skip to content

Commit 8d751da

Browse files
raagjadavandy-shev
authored andcommitted
pinctrl: intel: fetch community only when we need it
We check community features only in case PIN_CONFIG_BIAS_PULL_DOWN while setting/getting pad termination. No need to fetch the community otherwise. Signed-off-by: Raag Jadav <raag.jadav@intel.com> Acked-by: Mika Westerberg <mika.westerberg@linux.intel.com> Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
1 parent 6fe13aa commit 8d751da

File tree

1 file changed

+7
-6
lines changed

1 file changed

+7
-6
lines changed

drivers/pinctrl/intel/pinctrl-intel.c

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -534,11 +534,9 @@ static const struct pinmux_ops intel_pinmux_ops = {
534534
static int intel_config_get_pull(struct intel_pinctrl *pctrl, unsigned int pin,
535535
enum pin_config_param param, u32 *arg)
536536
{
537-
const struct intel_community *community;
538537
void __iomem *padcfg1;
539538
u32 value, term;
540539

541-
community = intel_get_community(pctrl, pin);
542540
padcfg1 = intel_get_padcfg(pctrl, pin, PADCFG1);
543541

544542
scoped_guard(raw_spinlock_irqsave, &pctrl->lock)
@@ -576,7 +574,9 @@ static int intel_config_get_pull(struct intel_pinctrl *pctrl, unsigned int pin,
576574

577575
break;
578576

579-
case PIN_CONFIG_BIAS_PULL_DOWN:
577+
case PIN_CONFIG_BIAS_PULL_DOWN: {
578+
const struct intel_community *community = intel_get_community(pctrl, pin);
579+
580580
if (!term || value & PADCFG1_TERM_UP)
581581
return -EINVAL;
582582

@@ -603,6 +603,7 @@ static int intel_config_get_pull(struct intel_pinctrl *pctrl, unsigned int pin,
603603
}
604604

605605
break;
606+
}
606607

607608
default:
608609
return -EINVAL;
@@ -673,7 +674,6 @@ static int intel_config_set_pull(struct intel_pinctrl *pctrl, unsigned int pin,
673674
{
674675
unsigned int param = pinconf_to_config_param(config);
675676
unsigned int arg = pinconf_to_config_argument(config);
676-
const struct intel_community *community;
677677
u32 term = 0, up = 0, value;
678678
void __iomem *padcfg1;
679679

@@ -709,8 +709,8 @@ static int intel_config_set_pull(struct intel_pinctrl *pctrl, unsigned int pin,
709709
up = PADCFG1_TERM_UP;
710710
break;
711711

712-
case PIN_CONFIG_BIAS_PULL_DOWN:
713-
community = intel_get_community(pctrl, pin);
712+
case PIN_CONFIG_BIAS_PULL_DOWN: {
713+
const struct intel_community *community = intel_get_community(pctrl, pin);
714714

715715
switch (arg) {
716716
case 20000:
@@ -737,6 +737,7 @@ static int intel_config_set_pull(struct intel_pinctrl *pctrl, unsigned int pin,
737737
}
738738

739739
break;
740+
}
740741

741742
default:
742743
return -EINVAL;

0 commit comments

Comments
 (0)