Re: [gpio:devel 12/12] drivers/pinctrl/mvebu/pinctrl-armada-37xx.c:630:27: error: 'struct gpio_chip' has no member named 'irq_base'; did you mean 'base'?

[Thierry Reding <thierry.reding@gmail.com>]

[-- Attachment #1: Type: text/plain, Size: 2883 bytes --]

On Mon, Oct 16, 2017 at 10:05:02AM +0200, Thierry Reding wrote:
> On Sun, Oct 15, 2017 at 04:21:14PM +0200, Linus Walleij wrote:
> > Grygorii, can you look at this?
> > 
> > Linus
> > 
> > On Sun, Oct 15, 2017 at 3:52 AM, kbuild test robot
> > <fengguang.wu@intel.com> wrote:
> > > tree:   https://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-gpio.git devel
> > > head:   be58c675d634e0b91edc0f721c77303ac2afa809
> > > commit: be58c675d634e0b91edc0f721c77303ac2afa809 [12/12] gpiolib: drop irq_base field from gpio_chip struct
> > > config: arm64-defconfig (attached as .config)
> > > compiler: aarch64-linux-gnu-gcc (Debian 6.1.1-9) 6.1.1 20160705
> > > reproduce:
> > >         wget https://raw.githubusercontent.com/intel/lkp-tests/master/sbin/make.cross -O ~/bin/make.cross
> > >         chmod +x ~/bin/make.cross
> > >         git checkout be58c675d634e0b91edc0f721c77303ac2afa809
> > >         # save the attached .config to linux build tree
> > >         make.cross ARCH=arm64
> > >
> > > All errors (new ones prefixed by >>):
> > >
> > >    drivers/pinctrl/mvebu/pinctrl-armada-37xx.c: In function 'armada_37xx_irq_startup':
> > >>> drivers/pinctrl/mvebu/pinctrl-armada-37xx.c:630:27: error: 'struct gpio_chip' has no member named 'irq_base'; did you mean 'base'?
> > >      int irq = d->hwirq - chip->irq_base;
> 
> This looks like something you'd get if you merge my struct
> gpio_irq_chip patches. However, the patch in my series will do the
> conversion of the pinctrl-armada-37xx driver:
> 
> --- >8 ---
> $ git log -p -- drivers/pinctrl/mvebu/pinctrl-armada-37xx.c
> commit 96e359456c942969fc3f0faa277fb27d1a830692
> Author: Thierry Reding <treding@nvidia.com>
> Date:   Mon Apr 3 11:40:03 2017 +0200
> 
>     gpio: Move irq_base to struct gpio_irq_chip
> 
>     In order to consolidate the multiple ways to associate an IRQ chip with
>     a GPIO chip, move more fields into the new struct gpio_irq_chip.
> 
>     Signed-off-by: Thierry Reding <treding@nvidia.com>
> 
> diff --git a/drivers/pinctrl/mvebu/pinctrl-armada-37xx.c b/drivers/pinctrl/mvebu/pinctrl-armada-37xx.c
> index c9851bd120b4..500238d898ea 100644
> --- a/drivers/pinctrl/mvebu/pinctrl-armada-37xx.c
> +++ b/drivers/pinctrl/mvebu/pinctrl-armada-37xx.c
> @@ -627,7 +627,7 @@ static void armada_37xx_irq_handler(struct irq_desc *desc)
>  static unsigned int armada_37xx_irq_startup(struct irq_data *d)
>  {
>         struct gpio_chip *chip = irq_data_get_irq_chip_data(d);
> -       int irq = d->hwirq - chip->irq_base;
> +       int irq = d->hwirq - chip->irq.first;
>         /*
>          * The mask field is a "precomputed bitmask for accessing the
>          * chip registers" which was introduced for the generic

Nevermind, I see there is now yet another conflict that would require
yet another rebase of that series.

Thierry

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]