[PATCH] ARM: cns3xxx: fix typo in PCI config accessor

[PATCH] ARM: cns3xxx: fix typo in PCI config accessor

[Arnd Bergmann]

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.

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;
 }

[PATCH] ARM: cns3xxx: fix typo in PCI config accessor

[Bjorn Helgaas]

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;
>  }
> 

[PATCH] ARM: cns3xxx: fix typo in PCI config accessor

[Rob Herring]

On Wed, Jan 28, 2015 at 9:17 AM, Bjorn Helgaas <bhelgaas@google.com> wrote:
> 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.

Sorry about this. I had fixed this in my tree, but forgot to send out
the update. I've double checked and this was the only fix I had.

How do you get success reports? I only ever get failures.

Rob

>
>> 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;
>>  }
>>

[PATCH] ARM: cns3xxx: fix typo in PCI config accessor

[Bjorn Helgaas]

[+cc Fengguang]

On Wed, Jan 28, 2015 at 9:34 AM, Rob Herring <robh@kernel.org> wrote:
> On Wed, Jan 28, 2015 at 9:17 AM, Bjorn Helgaas <bhelgaas@google.com> wrote:
>> 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.
>
> Sorry about this. I had fixed this in my tree, but forgot to send out
> the update. I've double checked and this was the only fix I had.
>
> How do you get success reports? I only ever get failures.

I think Fengguang has it set up so success reports only go to the
owner of the tree, while failure reports go to the owner + people
related to the patch, e.g., maybe people in the signed-off-by list?  I
don't know whether that's configurable, or whether you'd even want to
see all the success reports from my tree :)

Bjorn

>>> 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;
>>>  }
>>>

[PATCH] ARM: cns3xxx: fix typo in PCI config accessor

[Krzysztof Hałasa]

Arnd Bergmann <arnd@arndb.de> writes:

> 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")
Acked-by: Krzysztof Ha?asa <khalasa@piap.pl>

-- 
Krzysztof Halasa

Research Institute for Automation and Measurements PIAP
Al. Jerozolimskie 202, 02-486 Warsaw, Poland