Skip to content

Commit d1bfd02

Browse files
committed
pinctrl: intel: Make use of for_each_requested_gpio_in_range()
Make use of for_each_requested_gpio_in_range() instead of home grown analogue. Signed-off-by: Andy Shevchenko <[email protected]> Acked-by: Mika Westerberg <[email protected]>
1 parent e64fbfa commit d1bfd02

File tree

1 file changed

+6
-15
lines changed

1 file changed

+6
-15
lines changed

drivers/pinctrl/intel/pinctrl-intel.c

Lines changed: 6 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1628,19 +1628,6 @@ static void intel_gpio_irq_init(struct intel_pinctrl *pctrl)
16281628
}
16291629
}
16301630

1631-
static u32
1632-
intel_gpio_is_requested(struct gpio_chip *chip, int base, unsigned int size)
1633-
{
1634-
u32 requested = 0;
1635-
unsigned int i;
1636-
1637-
for (i = 0; i < size; i++)
1638-
if (gpiochip_is_requested(chip, base + i))
1639-
requested |= BIT(i);
1640-
1641-
return requested;
1642-
}
1643-
16441631
static bool intel_gpio_update_reg(void __iomem *reg, u32 mask, u32 value)
16451632
{
16461633
u32 curr, updated;
@@ -1661,12 +1648,16 @@ static void intel_restore_hostown(struct intel_pinctrl *pctrl, unsigned int c,
16611648
const struct intel_community *community = &pctrl->communities[c];
16621649
const struct intel_padgroup *padgrp = &community->gpps[gpp];
16631650
struct device *dev = pctrl->dev;
1664-
u32 requested;
1651+
const char *dummy;
1652+
u32 requested = 0;
1653+
unsigned int i;
16651654

16661655
if (padgrp->gpio_base == INTEL_GPIO_BASE_NOMAP)
16671656
return;
16681657

1669-
requested = intel_gpio_is_requested(&pctrl->chip, padgrp->gpio_base, padgrp->size);
1658+
for_each_requested_gpio_in_range(&pctrl->chip, i, padgrp->gpio_base, padgrp->size, dummy)
1659+
requested |= BIT(i);
1660+
16701661
if (!intel_gpio_update_reg(base + gpp * 4, requested, saved))
16711662
return;
16721663

0 commit comments

Comments
 (0)