[PATCH 1/6] include, sound: pci_find_device remove (include/asm-i386/ide.h)

From: Jiri Slaby
Date: Fri Sep 02 2005 - 16:46:22 EST


Generated in 2.6.13-mm1 kernel version.

Signed-off-by: Jiri Slaby <xslaby@xxxxxxxxxx>

ide.h | 7 ++++++-
1 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/include/asm-i386/ide.h b/include/asm-i386/ide.h
--- a/include/asm-i386/ide.h
+++ b/include/asm-i386/ide.h
@@ -41,7 +41,12 @@ static __inline__ int ide_default_irq(un

static __inline__ unsigned long ide_default_io_base(int index)
{
- if (pci_find_device(PCI_ANY_ID, PCI_ANY_ID, NULL) == NULL) {
+ struct pci_dev *pdev = pci_get_device(PCI_ANY_ID, PCI_ANY_ID, NULL);
+ unsigned int a = !pdev;
+
+ pci_dev_put(pdev);
+
+ if (a) {
switch(index) {
case 2: return 0x1e8;
case 3: return 0x168;
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/