diff options
author | Greg Kroah-Hartman <gregkh@suse.de> | 2006-05-01 14:13:54 -0700 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2006-05-01 14:13:54 -0700 |
commit | 8cfbdfb0cdc67a9d3d34643d43db61742534531f (patch) | |
tree | cd1d6bb3f8636741a7d8243bc6c0f88eb96cef14 /pci | |
parent | 26bd12af5a02290d7029a5c75f2b4b4eed51a936 (diff) | |
download | patches-8cfbdfb0cdc67a9d3d34643d43db61742534531f.tar.gz |
remove pci patches in mainline
Diffstat (limited to 'pci')
-rw-r--r-- | pci/pci-documentation-no-more-device-ids.patch | 44 | ||||
-rw-r--r-- | pci/pci-fix-potential-resource-leak-in-drivers-pci-msi.c.patch | 35 | ||||
-rw-r--r-- | pci/pci-fix-via-irq.patch | 27 | ||||
-rw-r--r-- | pci/pci-quirk-via-irq-fixup-should-only-run-for-via-southbridges.patch | 44 |
4 files changed, 0 insertions, 150 deletions
diff --git a/pci/pci-documentation-no-more-device-ids.patch b/pci/pci-documentation-no-more-device-ids.patch deleted file mode 100644 index c686a53d36b94..0000000000000 --- a/pci/pci-documentation-no-more-device-ids.patch +++ /dev/null @@ -1,44 +0,0 @@ -From owner-linux-pci@atrey.karlin.mff.cuni.cz Tue Apr 18 02:21:16 2006 -From: Ingo Oeser <netdev@axxeo.de> -To: Greg Kroah-Hartmann <gregkh@suse.de> -Subject: PCI: Documentation: no more device ids -Date: Tue, 18 Apr 2006 11:20:55 +0200 -Cc: Jeff Garzik <jgarzik@pobox.com> -Content-Disposition: inline -Message-Id: <200604181120.55783.netdev@axxeo.de> - -From: Ingo Oeser <netdev@axxeo.de> - -Document that we don't like to add more PCI device ids -but are happy to accept PCI vendor ids for linux/include/pci_ids.h - -Original text from Jeff Garzik. - -Signed-off-by: Ingo Oeser <netdev@axxeo.de> -Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> - ---- - Documentation/pci.txt | 12 +++++++++++- - 1 file changed, 11 insertions(+), 1 deletion(-) - ---- gregkh-2.6.orig/Documentation/pci.txt -+++ gregkh-2.6/Documentation/pci.txt -@@ -259,7 +259,17 @@ on the bus need to be capable of doing i - to be handled by platform and generic code, not individual drivers. - - --8. Obsolete functions -+8. Vendor and device identifications -+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -+For the future, let's avoid adding device ids to include/linux/pci_ids.h. -+ -+PCI_VENDOR_ID_xxx for vendors, and a hex constant for device ids. -+ -+Rationale: PCI_VENDOR_ID_xxx constants are re-used, but device ids are not. -+ Further, device ids are arbitrary hex numbers, normally used only in a -+ single location, the pci_device_id table. -+ -+9. Obsolete functions - ~~~~~~~~~~~~~~~~~~~~~ - There are several functions which you might come across when trying to - port an old driver to the new PCI interface. They are no longer present diff --git a/pci/pci-fix-potential-resource-leak-in-drivers-pci-msi.c.patch b/pci/pci-fix-potential-resource-leak-in-drivers-pci-msi.c.patch deleted file mode 100644 index 890b5bbc77b7c..0000000000000 --- a/pci/pci-fix-potential-resource-leak-in-drivers-pci-msi.c.patch +++ /dev/null @@ -1,35 +0,0 @@ -From linux-kernel-owner@vger.kernel.org Sun Apr 16 19:04:07 2006 -From: Jesper Juhl <jesper.juhl@gmail.com> -To: linux-kernel@vger.kernel.org -Subject: PCI: fix potential resource leak in drivers/pci/msi.c -Date: Mon, 17 Apr 2006 04:02:54 +0200 -Cc: Tom Long Nguyen <tom.l.nguyen@intel.com>, Jesper Juhl <jesper.juhl@gmail.com> -Content-Disposition: inline -Message-Id: <200604170402.54458.jesper.juhl@gmail.com> - -The coverity checker spotted (as entry #599) that we might leak `entry' in -drivers/pci/msi.c::msix_capability_init() -This patch should take care of that. - - -Signed-off-by: Jesper Juhl <jesper.juhl@gmail.com> -Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> - ---- - drivers/pci/msi.c | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - ---- gregkh-2.6.orig/drivers/pci/msi.c -+++ gregkh-2.6/drivers/pci/msi.c -@@ -793,8 +793,10 @@ static int msix_capability_init(struct p - if (!entry) - break; - vector = get_msi_vector(dev); -- if (vector < 0) -+ if (vector < 0) { -+ kmem_cache_free(msi_cachep, entry); - break; -+ } - - j = entries[i].entry; - entries[i].vector = vector; diff --git a/pci/pci-fix-via-irq.patch b/pci/pci-fix-via-irq.patch deleted file mode 100644 index bf310c4508d0f..0000000000000 --- a/pci/pci-fix-via-irq.patch +++ /dev/null @@ -1,27 +0,0 @@ -From foo@baz Tue Apr 9 12:12:43 2002 -Date: Thu, 20 Apr 2006 15:50:55 +0900 -To: Greg KH <greg@kroah.com> -From: Greg Kroah-Hartman <gregkh@suse.de> -Subject: PCI: fix via irq SATA patch - -This device id improperly got added to the VIA chipset list with a -previous patch. Remove it as it is not correct. - -Cc: Grzegorz Janoszka <Grzegorz@Janoszka.pl> -Cc: Jeff Garzik <jeff@garzik.org> -Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> - ---- - arch/i386/pci/irq.c | 1 - - 1 file changed, 1 deletion(-) - ---- gregkh-2.6.orig/arch/i386/pci/irq.c -+++ gregkh-2.6/arch/i386/pci/irq.c -@@ -591,7 +591,6 @@ static __init int via_router_probe(struc - case PCI_DEVICE_ID_VIA_8233A: - case PCI_DEVICE_ID_VIA_8235: - case PCI_DEVICE_ID_VIA_8237: -- case PCI_DEVICE_ID_VIA_8237_SATA: - /* FIXME: add new ones for 8233/5 */ - r->name = "VIA"; - r->get = pirq_via_get; diff --git a/pci/pci-quirk-via-irq-fixup-should-only-run-for-via-southbridges.patch b/pci/pci-quirk-via-irq-fixup-should-only-run-for-via-southbridges.patch deleted file mode 100644 index e331957d6847b..0000000000000 --- a/pci/pci-quirk-via-irq-fixup-should-only-run-for-via-southbridges.patch +++ /dev/null @@ -1,44 +0,0 @@ -From linux-kernel-owner@vger.kernel.org Tue Apr 18 23:57:45 2006 -Date: Tue, 18 Apr 2006 23:57:09 -0700 -From: Chris Wedgwood <cw@f00f.org> -Cc: Alan Cox <alan@lxorguk.ukuu.org.uk>, Andrew Morton <akpm@osdl.org> -Subject: PCI quirk: VIA IRQ fixup should only run for VIA southbridges -Message-ID: <20060419065709.GA8075@taniwha.stupidest.org> -Content-Disposition: inline - -Alan Cox pointed out that the VIA 'IRQ fixup' was erroneously running -on my system which has no VIA southbridge (but I do have a VIA IEEE -1394 device). - -This should address that. I also changed "Via IRQ" to "VIA IRQ" -(initially I read Via as a capitalized via (by way/means of). - - -Signed-off-by: Chris Wedgwood <cw@f00f.org> -Acked-by: Jeff Garzik <jeff@garzik.org> -Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> - ---- - drivers/pci/quirks.c | 6 ++++-- - 1 file changed, 4 insertions(+), 2 deletions(-) - ---- gregkh-2.6.orig/drivers/pci/quirks.c -+++ gregkh-2.6/drivers/pci/quirks.c -@@ -642,13 +642,15 @@ static void quirk_via_irq(struct pci_dev - new_irq = dev->irq & 0xf; - pci_read_config_byte(dev, PCI_INTERRUPT_LINE, &irq); - if (new_irq != irq) { -- printk(KERN_INFO "PCI: Via IRQ fixup for %s, from %d to %d\n", -+ printk(KERN_INFO "PCI: VIA IRQ fixup for %s, from %d to %d\n", - pci_name(dev), irq, new_irq); - udelay(15); /* unknown if delay really needed */ - pci_write_config_byte(dev, PCI_INTERRUPT_LINE, new_irq); - } - } --DECLARE_PCI_FIXUP_ENABLE(PCI_VENDOR_ID_VIA, PCI_ANY_ID, quirk_via_irq); -+DECLARE_PCI_FIXUP_ENABLE(PCI_VENDOR_ID_VIA, PCI_DEVICE_ID_VIA_82C686, quirk_via_irq); -+DECLARE_PCI_FIXUP_ENABLE(PCI_VENDOR_ID_VIA, PCI_DEVICE_ID_VIA_82C686_4, quirk_via_irq); -+DECLARE_PCI_FIXUP_ENABLE(PCI_VENDOR_ID_VIA, PCI_DEVICE_ID_VIA_82C686_5, quirk_via_irq); - - /* - * VIA VT82C598 has its device ID settable and many BIOSes |