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

pinctrl: intel: 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>

+7 -7
+7 -7
drivers/pinctrl/intel/pinctrl-intel.c
··· 279 279 { 280 280 struct intel_pinctrl *pctrl = pinctrl_dev_get_drvdata(pctldev); 281 281 282 - return pctrl->soc->groups[group].name; 282 + return pctrl->soc->groups[group].grp.name; 283 283 } 284 284 285 285 static int intel_get_group_pins(struct pinctrl_dev *pctldev, unsigned int group, ··· 287 287 { 288 288 struct intel_pinctrl *pctrl = pinctrl_dev_get_drvdata(pctldev); 289 289 290 - *pins = pctrl->soc->groups[group].pins; 291 - *npins = pctrl->soc->groups[group].npins; 290 + *pins = pctrl->soc->groups[group].grp.pins; 291 + *npins = pctrl->soc->groups[group].grp.npins; 292 292 return 0; 293 293 } 294 294 ··· 391 391 * All pins in the groups needs to be accessible and writable 392 392 * before we can enable the mux for this group. 393 393 */ 394 - for (i = 0; i < grp->npins; i++) { 395 - if (!intel_pad_usable(pctrl, grp->pins[i])) { 394 + for (i = 0; i < grp->grp.npins; i++) { 395 + if (!intel_pad_usable(pctrl, grp->grp.pins[i])) { 396 396 raw_spin_unlock_irqrestore(&pctrl->lock, flags); 397 397 return -EBUSY; 398 398 } 399 399 } 400 400 401 401 /* Now enable the mux setting for each pin in the group */ 402 - for (i = 0; i < grp->npins; i++) { 402 + for (i = 0; i < grp->grp.npins; i++) { 403 403 void __iomem *padcfg0; 404 404 u32 value; 405 405 406 - padcfg0 = intel_get_padcfg(pctrl, grp->pins[i], PADCFG0); 406 + padcfg0 = intel_get_padcfg(pctrl, grp->grp.pins[i], PADCFG0); 407 407 value = readl(padcfg0); 408 408 409 409 value &= ~PADCFG0_PMODE_MASK;