git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fedora kernel-2.6.17-1.2142_FC4 patched with stable patch-2.6.17.4-vs2.0.2-rc26.diff
[linux-2.6.git]
/
arch
/
sparc
/
kernel
/
ebus.c
diff --git
a/arch/sparc/kernel/ebus.c
b/arch/sparc/kernel/ebus.c
index
8ae7e5d
..
5c3529c
100644
(file)
--- a/
arch/sparc/kernel/ebus.c
+++ b/
arch/sparc/kernel/ebus.c
@@
-22,7
+22,7
@@
#include <asm/oplib.h>
#include <asm/bpp.h>
#include <asm/oplib.h>
#include <asm/bpp.h>
-struct linux_ebus *ebus_chain =
0
;
+struct linux_ebus *ebus_chain =
NULL
;
/* We are together with pcic.c under CONFIG_PCI. */
extern unsigned int pcic_pin_to_irq(unsigned int, char *name);
/* We are together with pcic.c under CONFIG_PCI. */
extern unsigned int pcic_pin_to_irq(unsigned int, char *name);
@@
-46,7
+46,7
@@
static struct ebus_device_irq je1_1[] = {
{ "SUNW,CS4231", 0 },
{ "parallel", 0 },
{ "se", 2 },
{ "SUNW,CS4231", 0 },
{ "parallel", 0 },
{ "se", 2 },
- {
0
, 0 }
+ {
NULL
, 0 }
};
/*
};
/*
@@
-55,7
+55,7
@@
static struct ebus_device_irq je1_1[] = {
*/
static struct ebus_system_entry ebus_blacklist[] = {
{ "SUNW,JavaEngine1", je1_1 },
*/
static struct ebus_system_entry ebus_blacklist[] = {
{ "SUNW,JavaEngine1", je1_1 },
- {
0, 0
}
+ {
NULL, NULL
}
};
static struct ebus_device_irq *ebus_blackp = NULL;
};
static struct ebus_device_irq *ebus_blackp = NULL;
@@
-233,7
+233,7
@@
void __init fill_ebus_device(int node, struct linux_ebus_device *dev)
ebus_alloc(sizeof(struct linux_ebus_child));
child = dev->children;
ebus_alloc(sizeof(struct linux_ebus_child));
child = dev->children;
- child->next =
0
;
+ child->next =
NULL
;
child->parent = dev;
child->bus = dev->bus;
fill_ebus_child(node, ®s[0], child);
child->parent = dev;
child->bus = dev->bus;
fill_ebus_child(node, ®s[0], child);
@@
-243,7
+243,7
@@
void __init fill_ebus_device(int node, struct linux_ebus_device *dev)
ebus_alloc(sizeof(struct linux_ebus_child));
child = child->next;
ebus_alloc(sizeof(struct linux_ebus_child));
child = child->next;
- child->next =
0
;
+ child->next =
NULL
;
child->parent = dev;
child->bus = dev->bus;
fill_ebus_child(node, ®s[0], child);
child->parent = dev;
child->bus = dev->bus;
fill_ebus_child(node, ®s[0], child);
@@
-275,7
+275,7
@@
void __init ebus_init(void)
}
}
}
}
- pdev = pci_
find_device(PCI_VENDOR_ID_SUN, PCI_DEVICE_ID_SUN_EBUS, 0
);
+ pdev = pci_
get_device(PCI_VENDOR_ID_SUN, PCI_DEVICE_ID_SUN_EBUS, NULL
);
if (!pdev) {
return;
}
if (!pdev) {
return;
}
@@
-284,7
+284,7
@@
void __init ebus_init(void)
ebus_chain = ebus = (struct linux_ebus *)
ebus_alloc(sizeof(struct linux_ebus));
ebus_chain = ebus = (struct linux_ebus *)
ebus_alloc(sizeof(struct linux_ebus));
- ebus->next =
0
;
+ ebus->next =
NULL
;
while (ebusnd) {
while (ebusnd) {
@@
-325,8
+325,8
@@
void __init ebus_init(void)
ebus_alloc(sizeof(struct linux_ebus_device));
dev = ebus->devices;
ebus_alloc(sizeof(struct linux_ebus_device));
dev = ebus->devices;
- dev->next =
0
;
- dev->children =
0
;
+ dev->next =
NULL
;
+ dev->children =
NULL
;
dev->bus = ebus;
fill_ebus_device(nd, dev);
dev->bus = ebus;
fill_ebus_device(nd, dev);
@@
-335,14
+335,14
@@
void __init ebus_init(void)
ebus_alloc(sizeof(struct linux_ebus_device));
dev = dev->next;
ebus_alloc(sizeof(struct linux_ebus_device));
dev = dev->next;
- dev->next =
0
;
- dev->children =
0
;
+ dev->next =
NULL
;
+ dev->children =
NULL
;
dev->bus = ebus;
fill_ebus_device(nd, dev);
}
next_ebus:
dev->bus = ebus;
fill_ebus_device(nd, dev);
}
next_ebus:
- pdev = pci_
find
_device(PCI_VENDOR_ID_SUN,
+ pdev = pci_
get
_device(PCI_VENDOR_ID_SUN,
PCI_DEVICE_ID_SUN_EBUS, pdev);
if (!pdev)
break;
PCI_DEVICE_ID_SUN_EBUS, pdev);
if (!pdev)
break;
@@
-353,7
+353,9
@@
void __init ebus_init(void)
ebus->next = (struct linux_ebus *)
ebus_alloc(sizeof(struct linux_ebus));
ebus = ebus->next;
ebus->next = (struct linux_ebus *)
ebus_alloc(sizeof(struct linux_ebus));
ebus = ebus->next;
- ebus->next =
0
;
+ ebus->next =
NULL
;
++num_ebus;
}
++num_ebus;
}
+ if (pdev)
+ pci_dev_put(pdev);
}
}