Skip to content

Commit 264c131

Browse files
committed
Merge tag 'intel-pinctrl-v6.12-1' of git://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/intel into devel
intel-pinctrl for v6.12-1 * Enable High Impedance pin configuration support for Intel pin control * Miscellaneous small improvements here and there The following is an automated git shortlog grouped by driver: baytrail: - Drop duplicate return statement intel: - Constify struct intel_pinctrl parameter - Inline intel_gpio_community_irq_handler() - Introduce for_each_intel_gpio_group() helper et al. - Constify intel_get_community() returned object - Implement high impedance support - Add __intel_gpio_get_direction() helper - Refactor __intel_gpio_set_direction() to be more useful - Move debounce validation out of the lock Signed-off-by: Linus Walleij <[email protected]>
2 parents 92f4368 + 1652e95 commit 264c131

File tree

4 files changed

+189
-147
lines changed

4 files changed

+189
-147
lines changed

drivers/pinctrl/intel/pinctrl-baytrail.c

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -560,9 +560,10 @@ static DEFINE_RAW_SPINLOCK(byt_lock);
560560
static void __iomem *byt_gpio_reg(struct intel_pinctrl *vg, unsigned int offset,
561561
int reg)
562562
{
563-
struct intel_community *comm = intel_get_community(vg, offset);
563+
const struct intel_community *comm;
564564
u32 reg_offset;
565565

566+
comm = intel_get_community(vg, offset);
566567
if (!comm)
567568
return NULL;
568569

@@ -1541,10 +1542,8 @@ static int byt_gpio_probe(struct intel_pinctrl *vg)
15411542
}
15421543

15431544
ret = devm_gpiochip_add_data(vg->dev, gc, vg);
1544-
if (ret) {
1545+
if (ret)
15451546
dev_err(vg->dev, "failed adding byt-gpio chip\n");
1546-
return ret;
1547-
}
15481547

15491548
return ret;
15501549
}

0 commit comments

Comments
 (0)