From mboxrd@z Thu Jan  1 00:00:00 1970
From: bhelgaas@google.com (Bjorn Helgaas)
Date: Wed, 28 Jan 2015 09:17:12 -0600
Subject: [PATCH] ARM: cns3xxx: fix typo in PCI config accessor
In-Reply-To: <2000255.rnmr9HfSOg@wuerfel>
References: <2000255.rnmr9HfSOg@wuerfel>
Message-ID: <20150128151712.GA12050@google.com>
To: linux-arm-kernel@lists.infradead.org
List-Id: linux-arm-kernel.lists.infradead.org

On Wed, Jan 28, 2015 at 02:53:07PM +0100, Arnd Bergmann wrote:
> The recent patch to convert the cns3xxx PCI code added an
> extraneous opening bracket, which makes the build fail,
> so remove this.
> 
> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
> Fixes: 10e2c5540d48 ("ARM: cns3xxx: Convert PCI to use generic config accessors")
> ---
> 
> Hi Bjorn,
> 
> The broken patch just showed up in linux-next. Please apply this one on top,
> or fold it into the original patch if you don't mind rebasing.

I folded it in, thanks!  I guess Fengguang's autobuilder must not build
this config, because I got a success report from it.

> diff --git a/arch/arm/mach-cns3xxx/pcie.c b/arch/arm/mach-cns3xxx/pcie.c
> index e41fc339d100..c622c306c390 100644
> --- a/arch/arm/mach-cns3xxx/pcie.c
> +++ b/arch/arm/mach-cns3xxx/pcie.c
> @@ -101,7 +101,7 @@ static int cns3xxx_pci_read_config(struct pci_bus *bus, unsigned int devfn,
>  		 * for a PCIe bridge. So we must fixup the class code
>  		 * to 0x604 here.
>  		 */
> -		*val = (((((*val << shift) & 0xff) | (0x604 << 16)) >> shift) & mask;
> +		*val = ((((*val << shift) & 0xff) | (0x604 << 16)) >> shift) & mask;
>  
>  	return ret;
>  }
>