From patchwork Wed Jan 28 13:53:07 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 433970 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 154E814027C for ; Thu, 29 Jan 2015 08:53:05 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752511AbbA1VxC (ORCPT ); Wed, 28 Jan 2015 16:53:02 -0500 Received: from mout.kundenserver.de ([212.227.17.24]:51087 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754113AbbA1Uay (ORCPT ); Wed, 28 Jan 2015 15:30:54 -0500 Received: from wuerfel.localnet ([149.172.15.242]) by mrelayeu.kundenserver.de (mreue101) with ESMTPSA (Nemesis) id 0MaJR2-1Xwaiq1USG-00JoFL; Wed, 28 Jan 2015 14:53:08 +0100 From: Arnd Bergmann To: Bjorn Helgaas Cc: Rob Herring , Krzysztof Halasa , linux-arm-kernel@lists.infradead.org, linux-pci@vger.kernel.org Subject: [PATCH] ARM: cns3xxx: fix typo in PCI config accessor Date: Wed, 28 Jan 2015 14:53:07 +0100 Message-ID: <2000255.rnmr9HfSOg@wuerfel> User-Agent: KMail/4.11.5 (Linux/3.16.0-10-generic; KDE/4.11.5; x86_64; ; ) MIME-Version: 1.0 X-Provags-ID: V03:K0:DpHJ7hazh6TL3Brb9ZI4Oi2MietXtAnpTF9g+Djb30JeGw1/lwW bDz68I6R5KJSgZ6va+3Jmt5asd8LtyeVrd8akNQrK8qPaanXi8o5JpWOXaFIxAWSr8Nt2js 5VSO0Ij2WKm7tYEWh/MxIpZKBCXt0ERCya28CWwOftxrtO4LaC40l+5hwI9kAQoo0HLvVQr 4G4OqtSfQKuQ2KrCqrrAw== X-UI-Out-Filterresults: notjunk:1; Sender: linux-pci-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org 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 Fixes: 10e2c5540d48 ("ARM: cns3xxx: Convert PCI to use generic config accessors") Acked-by: Krzysztof Hałasa --- 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 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; }