ARM: cns3xxx: fix typo in PCI config accessor
diff mbox

Message ID 2000255.rnmr9HfSOg@wuerfel
State Accepted
Headers show

Commit Message

Arnd Bergmann Jan. 28, 2015, 1:53 p.m. UTC
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.


--
To unsubscribe from this list: send the line "unsubscribe linux-pci" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Comments

Bjorn Helgaas Jan. 28, 2015, 3:17 p.m. UTC | #1
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;
>  }
> 
--
To unsubscribe from this list: send the line "unsubscribe linux-pci" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Rob Herring Jan. 28, 2015, 3:34 p.m. UTC | #2
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;
>>  }
>>
--
To unsubscribe from this list: send the line "unsubscribe linux-pci" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Krzysztof =?utf-8?Q?Ha=C5=82asa?= Jan. 29, 2015, 6:37 a.m. UTC | #3
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>

Patch
diff mbox

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