diff for duplicates of <20110610143021.GA26043@linux-mips.org> diff --git a/a/content_digest b/N1/content_digest index 9ff8fea..7fe02ef 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -5,7 +5,24 @@ linux-pci@vger.kernel.org Anton Vorontsov <avorontsov@mvista.com> Chris Metcalf <cmetcalf@tilera.com> - " Colin\0" + Colin Cross <ccross@android.com> + David S. Miller <davem@davemloft.net> + Eric Miao <eric.y.miao@gmail.com> + Erik Gilling <konkers@android.com> + Guan Xuetao <gxt@mprc.pku.edu.cn> + H. Peter Anvin <hpa@zytor.com> + Imre Kaloz <kaloz@openwrt.org> + Ingo Molnar <mingo@redhat.com> + Ivan Kokshaysky <ink@jurassic.park.msu.ru> + Krzysztof Halasa <khc@pm.waw.pl> + Lennert Buytenhek <kernel@wantstofly.org> + Matt Turner <mattst88@gmail.com> + Nicolas Pitre <nico@fluxnic.net> + Olof Johansson <olof@lixom.net> + Paul Mundt <lethal@linux-sh.org> + Richard Henderson <rth@twiddle.net> + Russell King <linux@arm.linux.org.uk> + " Thomas Gleixner <tglx@linutronix.de>\0" "Cc\0Andrew Morton <akpm@linux-foundation.org>" linux-alpha@vger.kernel.org linux-arm-kernel@lists.infradead.org @@ -1599,4 +1616,4 @@ " int __must_check pci_request_regions(struct pci_dev *, const char *);\n" int __must_check pci_request_regions_exclusive(struct pci_dev *, const char *); -f91ab2585d465d44d0979731dbf8aac5cf746372a7d24eb401e4a53622fbf0f7 +a0d1c5e5d7d600d67e3baaa5276643c865023f43f18140d6090ad5a981f8a1f1
diff --git a/a/1.txt b/N2/1.txt index 8b72a22..f84cffc 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -425,7 +425,7 @@ index a31f8cd..2ae99ad 100644 +takara_map_irq_srm(const struct pci_dev *dev, u8 slot, u8 pin) { static char irq_tab[15][5] __initdata = { - { 16+3, 16+3, 16+3, 16+3, 16+3}, /* slot 6 == device 3 */ + { 16+3, 16+3, 16+3, 16+3, 16+3}, /* slot 6 = device 3 */ @@ -188,7 +188,7 @@ takara_map_irq_srm(struct pci_dev *dev, u8 slot, u8 pin) } @@ -434,7 +434,7 @@ index a31f8cd..2ae99ad 100644 +takara_map_irq(const struct pci_dev *dev, u8 slot, u8 pin) { static char irq_tab[15][5] __initdata = { - { 16+3, 16+3, 16+3, 16+3, 16+3}, /* slot 6 == device 3 */ + { 16+3, 16+3, 16+3, 16+3, 16+3}, /* slot 6 = device 3 */ diff --git a/arch/alpha/kernel/sys_titan.c b/arch/alpha/kernel/sys_titan.c index 6994407..f47b30a 100644 --- a/arch/alpha/kernel/sys_titan.c @@ -472,8 +472,8 @@ index 7a21927..17239bd 100644 -int __init it8152_pci_map_irq(struct pci_dev *dev, u8 slot, u8 pin) +int __init it8152_pci_map_irq(const struct pci_dev *dev, u8 slot, u8 pin) { - if ((dev->vendor == PCI_VENDOR_ID_ITE) && - (dev->device == PCI_DEVICE_ID_ITE_8152)) { + if ((dev->vendor = PCI_VENDOR_ID_ITE) && + (dev->device = PCI_DEVICE_ID_ITE_8152)) { diff --git a/arch/arm/include/asm/hardware/it8152.h b/arch/arm/include/asm/hardware/it8152.h index b2f95c7..b3fea38 100644 --- a/arch/arm/include/asm/hardware/it8152.h @@ -572,8 +572,8 @@ index e5ab5bd..511c673 100644 -static int __init ebsa285_map_irq(struct pci_dev *dev, u8 slot, u8 pin) +static int __init ebsa285_map_irq(const struct pci_dev *dev, u8 slot, u8 pin) { - if (dev->vendor == PCI_VENDOR_ID_CONTAQ && - dev->device == PCI_DEVICE_ID_CONTAQ_82C693) + if (dev->vendor = PCI_VENDOR_ID_CONTAQ && + dev->device = PCI_DEVICE_ID_CONTAQ_82C693) diff --git a/arch/arm/mach-footbridge/netwinder-pci.c b/arch/arm/mach-footbridge/netwinder-pci.c index e263d6d..6218761 100644 --- a/arch/arm/mach-footbridge/netwinder-pci.c @@ -847,7 +847,7 @@ index 37fda7d..71f5c9c 100644 -static int __init coyote_map_irq(struct pci_dev *dev, u8 slot, u8 pin) +static int __init coyote_map_irq(const struct pci_dev *dev, u8 slot, u8 pin) { - if (slot == SLOT0_DEVID) + if (slot = SLOT0_DEVID) return IXP4XX_GPIO_IRQ(SLOT0_INTA); diff --git a/arch/arm/mach-ixp4xx/dsmg600-pci.c b/arch/arm/mach-ixp4xx/dsmg600-pci.c index c7612010..0532510 100644 @@ -887,7 +887,7 @@ index fc11241..76581fb 100644 +static int __init gateway7001_map_irq(const struct pci_dev *dev, u8 slot, + u8 pin) { - if (slot == 1) + if (slot = 1) return IRQ_IXP4XX_GPIO11; diff --git a/arch/arm/mach-ixp4xx/goramo_mlr.c b/arch/arm/mach-ixp4xx/goramo_mlr.c index 3e8c0e3..249404d 100644 @@ -939,7 +939,7 @@ index e64f6d0..34efe75 100644 -static int __init ixdpg425_map_irq(struct pci_dev *dev, u8 slot, u8 pin) +static int __init ixdpg425_map_irq(const struct pci_dev *dev, u8 slot, u8 pin) { - if (slot == 12 || slot == 13) + if (slot = 12 || slot = 13) return IRQ_IXP4XX_GPIO7; diff --git a/arch/arm/mach-ixp4xx/nas100d-pci.c b/arch/arm/mach-ixp4xx/nas100d-pci.c index 428d120..5434ccf 100644 @@ -978,7 +978,7 @@ index 03bdec5..0bc3f34 100644 -static int __init vulcan_map_irq(struct pci_dev *dev, u8 slot, u8 pin) +static int __init vulcan_map_irq(const struct pci_dev *dev, u8 slot, u8 pin) { - if (slot == 1) + if (slot = 1) return IXP4XX_GPIO_IRQ(INTA); diff --git a/arch/arm/mach-ixp4xx/wg302v2-pci.c b/arch/arm/mach-ixp4xx/wg302v2-pci.c index 17f3cf5..f27dfcf 100644 @@ -991,7 +991,7 @@ index 17f3cf5..f27dfcf 100644 -static int __init wg302v2_map_irq(struct pci_dev *dev, u8 slot, u8 pin) +static int __init wg302v2_map_irq(const struct pci_dev *dev, u8 slot, u8 pin) { - if (slot == 1) + if (slot = 1) return IRQ_IXP4XX_GPIO8; diff --git a/arch/arm/mach-kirkwood/pcie.c b/arch/arm/mach-kirkwood/pcie.c index ca294ff..77d0f54 100644 @@ -1295,8 +1295,8 @@ index 89d175c..e0d1d43 100644 -static int __init shark_map_irq(struct pci_dev *dev, u8 slot, u8 pin) +static int __init shark_map_irq(const struct pci_dev *dev, u8 slot, u8 pin) { - if (dev->bus->number == 0) - if (dev->devfn == 0) + if (dev->bus->number = 0) + if (dev->devfn = 0) diff --git a/arch/arm/mach-tegra/pcie.c b/arch/arm/mach-tegra/pcie.c index 2941212..10639ff 100644 --- a/arch/arm/mach-tegra/pcie.c @@ -1516,8 +1516,7 @@ index 6d4cb5d..2a8014c 100644 -static int tile_map_irq(struct pci_dev *dev, u8 slot, u8 pin) +static int tile_map_irq(const struct pci_dev *dev, u8 slot, u8 pin) { - struct pci_controller *controller = - (struct pci_controller *)dev->sysdata; + struct pci_controller *controller (struct pci_controller *)dev->sysdata; diff --git a/arch/unicore32/kernel/pci.c b/arch/unicore32/kernel/pci.c index 100eab8..4892fbb 100644 --- a/arch/unicore32/kernel/pci.c @@ -1529,7 +1528,7 @@ index 100eab8..4892fbb 100644 -static int __init pci_puv3_map_irq(struct pci_dev *dev, u8 slot, u8 pin) +static int __init pci_puv3_map_irq(const struct pci_dev *dev, u8 slot, u8 pin) { - if (dev->bus->number == 0) { + if (dev->bus->number = 0) { #ifdef CONFIG_ARCH_FPGA /* 4 pci slots */ diff --git a/arch/x86/pci/visws.c b/arch/x86/pci/visws.c index 03008f7..6f2f8ee 100644 diff --git a/a/content_digest b/N2/content_digest index 9ff8fea..0d388b5 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -1,20 +1,7 @@ "From\0Ralf Baechle <ralf@linux-mips.org>\0" - "Subject\0[PATCH] PCI: Make the struct pci_dev * argument of pci_fixup_irqs const.\0" - "Date\0Fri, 10 Jun 2011 15:30:21 +0100\0" - "To\0Jesse Barnes <jbarnes@virtuousgeek.org>" - linux-pci@vger.kernel.org - Anton Vorontsov <avorontsov@mvista.com> - Chris Metcalf <cmetcalf@tilera.com> - " Colin\0" - "Cc\0Andrew Morton <akpm@linux-foundation.org>" - linux-alpha@vger.kernel.org - linux-arm-kernel@lists.infradead.org - linux-kernel@vger.kernel.org - linux-mips@linux-mips.org - linux-sh@vger.kernel.org - linux-tegra@vger.kernel.org - sparclinux@vger.kernel.org - " x86@kernel.org\0" + "Subject\0[PATCH] PCI: Make the struct pci_dev * argument of pci_fixup_irqs\0" + "Date\0Fri, 10 Jun 2011 14:30:21 +0000\0" + "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" "Aside of the usual motivation for constification, this function has a\n" @@ -444,7 +431,7 @@ "+takara_map_irq_srm(const struct pci_dev *dev, u8 slot, u8 pin)\n" " {\n" " \tstatic char irq_tab[15][5] __initdata = {\n" - " \t\t{ 16+3, 16+3, 16+3, 16+3, 16+3}, /* slot 6 == device 3 */\n" + " \t\t{ 16+3, 16+3, 16+3, 16+3, 16+3}, /* slot 6 = device 3 */\n" "@@ -188,7 +188,7 @@ takara_map_irq_srm(struct pci_dev *dev, u8 slot, u8 pin)\n" " }\n" " \n" @@ -453,7 +440,7 @@ "+takara_map_irq(const struct pci_dev *dev, u8 slot, u8 pin)\n" " {\n" " \tstatic char irq_tab[15][5] __initdata = {\n" - " \t\t{ 16+3, 16+3, 16+3, 16+3, 16+3}, /* slot 6 == device 3 */\n" + " \t\t{ 16+3, 16+3, 16+3, 16+3, 16+3}, /* slot 6 = device 3 */\n" "diff --git a/arch/alpha/kernel/sys_titan.c b/arch/alpha/kernel/sys_titan.c\n" "index 6994407..f47b30a 100644\n" "--- a/arch/alpha/kernel/sys_titan.c\n" @@ -491,8 +478,8 @@ "-int __init it8152_pci_map_irq(struct pci_dev *dev, u8 slot, u8 pin)\n" "+int __init it8152_pci_map_irq(const struct pci_dev *dev, u8 slot, u8 pin)\n" " {\n" - " \tif ((dev->vendor == PCI_VENDOR_ID_ITE) &&\n" - " \t (dev->device == PCI_DEVICE_ID_ITE_8152)) {\n" + " \tif ((dev->vendor = PCI_VENDOR_ID_ITE) &&\n" + " \t (dev->device = PCI_DEVICE_ID_ITE_8152)) {\n" "diff --git a/arch/arm/include/asm/hardware/it8152.h b/arch/arm/include/asm/hardware/it8152.h\n" "index b2f95c7..b3fea38 100644\n" "--- a/arch/arm/include/asm/hardware/it8152.h\n" @@ -591,8 +578,8 @@ "-static int __init ebsa285_map_irq(struct pci_dev *dev, u8 slot, u8 pin)\n" "+static int __init ebsa285_map_irq(const struct pci_dev *dev, u8 slot, u8 pin)\n" " {\n" - " \tif (dev->vendor == PCI_VENDOR_ID_CONTAQ &&\n" - " \t dev->device == PCI_DEVICE_ID_CONTAQ_82C693)\n" + " \tif (dev->vendor = PCI_VENDOR_ID_CONTAQ &&\n" + " \t dev->device = PCI_DEVICE_ID_CONTAQ_82C693)\n" "diff --git a/arch/arm/mach-footbridge/netwinder-pci.c b/arch/arm/mach-footbridge/netwinder-pci.c\n" "index e263d6d..6218761 100644\n" "--- a/arch/arm/mach-footbridge/netwinder-pci.c\n" @@ -866,7 +853,7 @@ "-static int __init coyote_map_irq(struct pci_dev *dev, u8 slot, u8 pin)\n" "+static int __init coyote_map_irq(const struct pci_dev *dev, u8 slot, u8 pin)\n" " {\n" - " \tif (slot == SLOT0_DEVID)\n" + " \tif (slot = SLOT0_DEVID)\n" " \t\treturn IXP4XX_GPIO_IRQ(SLOT0_INTA);\n" "diff --git a/arch/arm/mach-ixp4xx/dsmg600-pci.c b/arch/arm/mach-ixp4xx/dsmg600-pci.c\n" "index c7612010..0532510 100644\n" @@ -906,7 +893,7 @@ "+static int __init gateway7001_map_irq(const struct pci_dev *dev, u8 slot,\n" "+\tu8 pin)\n" " {\n" - " \tif (slot == 1)\n" + " \tif (slot = 1)\n" " \t\treturn IRQ_IXP4XX_GPIO11;\n" "diff --git a/arch/arm/mach-ixp4xx/goramo_mlr.c b/arch/arm/mach-ixp4xx/goramo_mlr.c\n" "index 3e8c0e3..249404d 100644\n" @@ -958,7 +945,7 @@ "-static int __init ixdpg425_map_irq(struct pci_dev *dev, u8 slot, u8 pin)\n" "+static int __init ixdpg425_map_irq(const struct pci_dev *dev, u8 slot, u8 pin)\n" " {\n" - " \tif (slot == 12 || slot == 13)\n" + " \tif (slot = 12 || slot = 13)\n" " \t\treturn IRQ_IXP4XX_GPIO7;\n" "diff --git a/arch/arm/mach-ixp4xx/nas100d-pci.c b/arch/arm/mach-ixp4xx/nas100d-pci.c\n" "index 428d120..5434ccf 100644\n" @@ -997,7 +984,7 @@ "-static int __init vulcan_map_irq(struct pci_dev *dev, u8 slot, u8 pin)\n" "+static int __init vulcan_map_irq(const struct pci_dev *dev, u8 slot, u8 pin)\n" " {\n" - " \tif (slot == 1)\n" + " \tif (slot = 1)\n" " \t\treturn IXP4XX_GPIO_IRQ(INTA);\n" "diff --git a/arch/arm/mach-ixp4xx/wg302v2-pci.c b/arch/arm/mach-ixp4xx/wg302v2-pci.c\n" "index 17f3cf5..f27dfcf 100644\n" @@ -1010,7 +997,7 @@ "-static int __init wg302v2_map_irq(struct pci_dev *dev, u8 slot, u8 pin)\n" "+static int __init wg302v2_map_irq(const struct pci_dev *dev, u8 slot, u8 pin)\n" " {\n" - " \tif (slot == 1)\n" + " \tif (slot = 1)\n" " \t\treturn IRQ_IXP4XX_GPIO8;\n" "diff --git a/arch/arm/mach-kirkwood/pcie.c b/arch/arm/mach-kirkwood/pcie.c\n" "index ca294ff..77d0f54 100644\n" @@ -1314,8 +1301,8 @@ "-static int __init shark_map_irq(struct pci_dev *dev, u8 slot, u8 pin)\n" "+static int __init shark_map_irq(const struct pci_dev *dev, u8 slot, u8 pin)\n" " {\n" - " \tif (dev->bus->number == 0)\n" - " \t\tif (dev->devfn == 0)\n" + " \tif (dev->bus->number = 0)\n" + " \t\tif (dev->devfn = 0)\n" "diff --git a/arch/arm/mach-tegra/pcie.c b/arch/arm/mach-tegra/pcie.c\n" "index 2941212..10639ff 100644\n" "--- a/arch/arm/mach-tegra/pcie.c\n" @@ -1535,8 +1522,7 @@ "-static int tile_map_irq(struct pci_dev *dev, u8 slot, u8 pin)\n" "+static int tile_map_irq(const struct pci_dev *dev, u8 slot, u8 pin)\n" " {\n" - " \tstruct pci_controller *controller =\n" - " \t\t(struct pci_controller *)dev->sysdata;\n" + " \tstruct pci_controller *controller \t\t(struct pci_controller *)dev->sysdata;\n" "diff --git a/arch/unicore32/kernel/pci.c b/arch/unicore32/kernel/pci.c\n" "index 100eab8..4892fbb 100644\n" "--- a/arch/unicore32/kernel/pci.c\n" @@ -1548,7 +1534,7 @@ "-static int __init pci_puv3_map_irq(struct pci_dev *dev, u8 slot, u8 pin)\n" "+static int __init pci_puv3_map_irq(const struct pci_dev *dev, u8 slot, u8 pin)\n" " {\n" - " \tif (dev->bus->number == 0) {\n" + " \tif (dev->bus->number = 0) {\n" " #ifdef CONFIG_ARCH_FPGA /* 4 pci slots */\n" "diff --git a/arch/x86/pci/visws.c b/arch/x86/pci/visws.c\n" "index 03008f7..6f2f8ee 100644\n" @@ -1599,4 +1585,4 @@ " int __must_check pci_request_regions(struct pci_dev *, const char *);\n" int __must_check pci_request_regions_exclusive(struct pci_dev *, const char *); -f91ab2585d465d44d0979731dbf8aac5cf746372a7d24eb401e4a53622fbf0f7 +ca9ae8a75bea873d111e77c07ba665e8ea1d54b62b748e91eff7072d6755d7cc
diff --git a/a/1.txt b/N3/1.txt index 8b72a22..13cc967 100644 --- a/a/1.txt +++ b/N3/1.txt @@ -29,15 +29,15 @@ To: Richard Henderson <rth@twiddle.net> To: Russell King <linux@arm.linux.org.uk> To: Thomas Gleixner <tglx@linutronix.de> Cc: Andrew Morton <akpm@linux-foundation.org> -Cc: linux-alpha@vger.kernel.org -Cc: linux-arm-kernel@lists.infradead.org -Cc: linux-kernel@vger.kernel.org -Cc: linux-mips@linux-mips.org -Cc: linux-pci@vger.kernel.org -Cc: linux-sh@vger.kernel.org -Cc: linux-tegra@vger.kernel.org -Cc: sparclinux@vger.kernel.org -Cc: x86@kernel.org +Cc: linux-alpha at vger.kernel.org +Cc: linux-arm-kernel at lists.infradead.org +Cc: linux-kernel at vger.kernel.org +Cc: linux-mips at linux-mips.org +Cc: linux-pci at vger.kernel.org +Cc: linux-sh at vger.kernel.org +Cc: linux-tegra at vger.kernel.org +Cc: sparclinux at vger.kernel.org +Cc: x86 at kernel.org --- arch/alpha/kernel/sys_alcor.c | 2 +- arch/alpha/kernel/sys_cabriolet.c | 6 +++--- diff --git a/a/content_digest b/N3/content_digest index 9ff8fea..c97041a 100644 --- a/a/content_digest +++ b/N3/content_digest @@ -1,20 +1,7 @@ - "From\0Ralf Baechle <ralf@linux-mips.org>\0" + "From\0ralf@linux-mips.org (Ralf Baechle)\0" "Subject\0[PATCH] PCI: Make the struct pci_dev * argument of pci_fixup_irqs const.\0" "Date\0Fri, 10 Jun 2011 15:30:21 +0100\0" - "To\0Jesse Barnes <jbarnes@virtuousgeek.org>" - linux-pci@vger.kernel.org - Anton Vorontsov <avorontsov@mvista.com> - Chris Metcalf <cmetcalf@tilera.com> - " Colin\0" - "Cc\0Andrew Morton <akpm@linux-foundation.org>" - linux-alpha@vger.kernel.org - linux-arm-kernel@lists.infradead.org - linux-kernel@vger.kernel.org - linux-mips@linux-mips.org - linux-sh@vger.kernel.org - linux-tegra@vger.kernel.org - sparclinux@vger.kernel.org - " x86@kernel.org\0" + "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" "Aside of the usual motivation for constification, this function has a\n" @@ -48,15 +35,15 @@ "To: Russell King <linux@arm.linux.org.uk>\n" "To: Thomas Gleixner <tglx@linutronix.de>\n" "Cc: Andrew Morton <akpm@linux-foundation.org>\n" - "Cc: linux-alpha@vger.kernel.org\n" - "Cc: linux-arm-kernel@lists.infradead.org\n" - "Cc: linux-kernel@vger.kernel.org\n" - "Cc: linux-mips@linux-mips.org\n" - "Cc: linux-pci@vger.kernel.org\n" - "Cc: linux-sh@vger.kernel.org\n" - "Cc: linux-tegra@vger.kernel.org\n" - "Cc: sparclinux@vger.kernel.org\n" - "Cc: x86@kernel.org\n" + "Cc: linux-alpha at vger.kernel.org\n" + "Cc: linux-arm-kernel at lists.infradead.org\n" + "Cc: linux-kernel at vger.kernel.org\n" + "Cc: linux-mips at linux-mips.org\n" + "Cc: linux-pci at vger.kernel.org\n" + "Cc: linux-sh at vger.kernel.org\n" + "Cc: linux-tegra at vger.kernel.org\n" + "Cc: sparclinux at vger.kernel.org\n" + "Cc: x86 at kernel.org\n" "---\n" " arch/alpha/kernel/sys_alcor.c | 2 +-\n" " arch/alpha/kernel/sys_cabriolet.c | 6 +++---\n" @@ -1599,4 +1586,4 @@ " int __must_check pci_request_regions(struct pci_dev *, const char *);\n" int __must_check pci_request_regions_exclusive(struct pci_dev *, const char *); -f91ab2585d465d44d0979731dbf8aac5cf746372a7d24eb401e4a53622fbf0f7 +5561fabb5e37f1903ae83513866aa4917c3bcdc1195d51cbb1a5416346f5ff65
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.