Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

pinctrl: baytrail: Switch to to embedded struct pingroup

Since struct intel_pingroup got a new member, switch the driver to use it.

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

+9 -9
+9 -9
drivers/pinctrl/intel/pinctrl-baytrail.c
··· 603 603 { 604 604 struct intel_pinctrl *vg = pinctrl_dev_get_drvdata(pctldev); 605 605 606 - return vg->soc->groups[selector].name; 606 + return vg->soc->groups[selector].grp.name; 607 607 } 608 608 609 609 static int byt_get_group_pins(struct pinctrl_dev *pctldev, ··· 613 613 { 614 614 struct intel_pinctrl *vg = pinctrl_dev_get_drvdata(pctldev); 615 615 616 - *pins = vg->soc->groups[selector].pins; 617 - *num_pins = vg->soc->groups[selector].npins; 616 + *pins = vg->soc->groups[selector].grp.pins; 617 + *num_pins = vg->soc->groups[selector].grp.npins; 618 618 619 619 return 0; 620 620 } ··· 662 662 663 663 raw_spin_lock_irqsave(&byt_lock, flags); 664 664 665 - for (i = 0; i < group.npins; i++) { 665 + for (i = 0; i < group.grp.npins; i++) { 666 666 void __iomem *padcfg0; 667 667 u32 value; 668 668 669 - padcfg0 = byt_gpio_reg(vg, group.pins[i], BYT_CONF0_REG); 669 + padcfg0 = byt_gpio_reg(vg, group.grp.pins[i], BYT_CONF0_REG); 670 670 if (!padcfg0) { 671 671 dev_warn(vg->dev, 672 672 "Group %s, pin %i not muxed (no padcfg0)\n", 673 - group.name, i); 673 + group.grp.name, i); 674 674 continue; 675 675 } 676 676 ··· 692 692 693 693 raw_spin_lock_irqsave(&byt_lock, flags); 694 694 695 - for (i = 0; i < group.npins; i++) { 695 + for (i = 0; i < group.grp.npins; i++) { 696 696 void __iomem *padcfg0; 697 697 u32 value; 698 698 699 - padcfg0 = byt_gpio_reg(vg, group.pins[i], BYT_CONF0_REG); 699 + padcfg0 = byt_gpio_reg(vg, group.grp.pins[i], BYT_CONF0_REG); 700 700 if (!padcfg0) { 701 701 dev_warn(vg->dev, 702 702 "Group %s, pin %i not muxed (no padcfg0)\n", 703 - group.name, i); 703 + group.grp.name, i); 704 704 continue; 705 705 } 706 706