From: Alan Cox <alan@lxorguk.ukuu.org.uk>
To: akpm@osdl.org, linux-kernel@vger.kernel.org
Subject: [PATCH] x86: resend - remove last two pci_find offenders in the core code
Date: Wed, 18 Oct 2006 18:24:45 +0100 [thread overview]
Message-ID: <1161192285.9363.99.camel@localhost.localdomain> (raw)
Resending as I believe the discussion about them established they were
correct.
Signed-off-by: Alan Cox <alan@redhat.com>
diff -u --new-file --recursive --exclude-from /usr/src/exclude linux.vanilla-2.6.19-rc2-mm1/arch/i386/pci/irq.c linux-2.6.19-rc2-mm1/arch/i386/pci/irq.c
--- linux.vanilla-2.6.19-rc2-mm1/arch/i386/pci/irq.c 2006-10-18 13:50:03.000000000 +0100
+++ linux-2.6.19-rc2-mm1/arch/i386/pci/irq.c 2006-10-18 13:54:08.000000000 +0100
@@ -758,7 +758,7 @@
DBG(KERN_DEBUG "PCI: Attempting to find IRQ router for %04x:%04x\n",
rt->rtr_vendor, rt->rtr_device);
- pirq_router_dev = pci_find_slot(rt->rtr_bus, rt->rtr_devfn);
+ pirq_router_dev = pci_get_bus_and_slot(rt->rtr_bus, rt->rtr_devfn);
if (!pirq_router_dev) {
DBG(KERN_DEBUG "PCI: Interrupt router not found at "
"%02x:%02x\n", rt->rtr_bus, rt->rtr_devfn);
@@ -778,6 +778,8 @@
pirq_router_dev->vendor,
pirq_router_dev->device,
pci_name(pirq_router_dev));
+
+ /* The device remains referenced for the kernel lifetime */
}
static struct irq_info *pirq_get_info(struct pci_dev *dev)
diff -u --new-file --recursive --exclude-from /usr/src/exclude linux.vanilla-2.6.19-rc2-mm1/arch/x86_64/kernel/pci-calgary.c linux-2.6.19-rc2-mm1/arch/x86_64/kernel/pci-calgary.c
--- linux.vanilla-2.6.19-rc2-mm1/arch/x86_64/kernel/pci-calgary.c 2006-10-18 13:51:02.000000000 +0100
+++ linux-2.6.19-rc2-mm1/arch/x86_64/kernel/pci-calgary.c 2006-10-18 13:54:28.000000000 +0100
@@ -879,7 +879,7 @@
error:
do {
- dev = pci_find_device_reverse(PCI_VENDOR_ID_IBM,
+ dev = pci_get_device_reverse(PCI_VENDOR_ID_IBM,
PCI_DEVICE_ID_IBM_CALGARY,
dev);
if (!dev)
reply other threads:[~2006-10-18 17:22 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1161192285.9363.99.camel@localhost.localdomain \
--to=alan@lxorguk.ukuu.org.uk \
--cc=akpm@osdl.org \
--cc=linux-kernel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®