diff options
Diffstat (limited to 'arch/sparc/kernel/ebus.c')
| -rw-r--r-- | arch/sparc/kernel/ebus.c | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/arch/sparc/kernel/ebus.c b/arch/sparc/kernel/ebus.c index 1754192c69d0..5c3529ceb5d6 100644 --- a/arch/sparc/kernel/ebus.c +++ b/arch/sparc/kernel/ebus.c | |||
| @@ -22,7 +22,7 @@ | |||
| 22 | #include <asm/oplib.h> | 22 | #include <asm/oplib.h> |
| 23 | #include <asm/bpp.h> | 23 | #include <asm/bpp.h> |
| 24 | 24 | ||
| 25 | struct linux_ebus *ebus_chain = 0; | 25 | struct linux_ebus *ebus_chain = NULL; |
| 26 | 26 | ||
| 27 | /* We are together with pcic.c under CONFIG_PCI. */ | 27 | /* We are together with pcic.c under CONFIG_PCI. */ |
| 28 | extern unsigned int pcic_pin_to_irq(unsigned int, char *name); | 28 | extern unsigned int pcic_pin_to_irq(unsigned int, char *name); |
| @@ -46,7 +46,7 @@ static struct ebus_device_irq je1_1[] = { | |||
| 46 | { "SUNW,CS4231", 0 }, | 46 | { "SUNW,CS4231", 0 }, |
| 47 | { "parallel", 0 }, | 47 | { "parallel", 0 }, |
| 48 | { "se", 2 }, | 48 | { "se", 2 }, |
| 49 | { 0, 0 } | 49 | { NULL, 0 } |
| 50 | }; | 50 | }; |
| 51 | 51 | ||
| 52 | /* | 52 | /* |
| @@ -55,7 +55,7 @@ static struct ebus_device_irq je1_1[] = { | |||
| 55 | */ | 55 | */ |
| 56 | static struct ebus_system_entry ebus_blacklist[] = { | 56 | static struct ebus_system_entry ebus_blacklist[] = { |
| 57 | { "SUNW,JavaEngine1", je1_1 }, | 57 | { "SUNW,JavaEngine1", je1_1 }, |
| 58 | { 0, 0 } | 58 | { NULL, NULL } |
| 59 | }; | 59 | }; |
| 60 | 60 | ||
| 61 | static struct ebus_device_irq *ebus_blackp = NULL; | 61 | static struct ebus_device_irq *ebus_blackp = NULL; |
| @@ -233,7 +233,7 @@ void __init fill_ebus_device(int node, struct linux_ebus_device *dev) | |||
| 233 | ebus_alloc(sizeof(struct linux_ebus_child)); | 233 | ebus_alloc(sizeof(struct linux_ebus_child)); |
| 234 | 234 | ||
| 235 | child = dev->children; | 235 | child = dev->children; |
| 236 | child->next = 0; | 236 | child->next = NULL; |
| 237 | child->parent = dev; | 237 | child->parent = dev; |
| 238 | child->bus = dev->bus; | 238 | child->bus = dev->bus; |
| 239 | fill_ebus_child(node, ®s[0], child); | 239 | fill_ebus_child(node, ®s[0], child); |
| @@ -243,7 +243,7 @@ void __init fill_ebus_device(int node, struct linux_ebus_device *dev) | |||
| 243 | ebus_alloc(sizeof(struct linux_ebus_child)); | 243 | ebus_alloc(sizeof(struct linux_ebus_child)); |
| 244 | 244 | ||
| 245 | child = child->next; | 245 | child = child->next; |
| 246 | child->next = 0; | 246 | child->next = NULL; |
| 247 | child->parent = dev; | 247 | child->parent = dev; |
| 248 | child->bus = dev->bus; | 248 | child->bus = dev->bus; |
| 249 | fill_ebus_child(node, ®s[0], child); | 249 | fill_ebus_child(node, ®s[0], child); |
| @@ -275,7 +275,7 @@ void __init ebus_init(void) | |||
| 275 | } | 275 | } |
| 276 | } | 276 | } |
| 277 | 277 | ||
| 278 | pdev = pci_get_device(PCI_VENDOR_ID_SUN, PCI_DEVICE_ID_SUN_EBUS, 0); | 278 | pdev = pci_get_device(PCI_VENDOR_ID_SUN, PCI_DEVICE_ID_SUN_EBUS, NULL); |
| 279 | if (!pdev) { | 279 | if (!pdev) { |
| 280 | return; | 280 | return; |
| 281 | } | 281 | } |
| @@ -284,7 +284,7 @@ void __init ebus_init(void) | |||
| 284 | 284 | ||
| 285 | ebus_chain = ebus = (struct linux_ebus *) | 285 | ebus_chain = ebus = (struct linux_ebus *) |
| 286 | ebus_alloc(sizeof(struct linux_ebus)); | 286 | ebus_alloc(sizeof(struct linux_ebus)); |
| 287 | ebus->next = 0; | 287 | ebus->next = NULL; |
| 288 | 288 | ||
| 289 | while (ebusnd) { | 289 | while (ebusnd) { |
| 290 | 290 | ||
| @@ -325,8 +325,8 @@ void __init ebus_init(void) | |||
| 325 | ebus_alloc(sizeof(struct linux_ebus_device)); | 325 | ebus_alloc(sizeof(struct linux_ebus_device)); |
| 326 | 326 | ||
| 327 | dev = ebus->devices; | 327 | dev = ebus->devices; |
| 328 | dev->next = 0; | 328 | dev->next = NULL; |
| 329 | dev->children = 0; | 329 | dev->children = NULL; |
| 330 | dev->bus = ebus; | 330 | dev->bus = ebus; |
| 331 | fill_ebus_device(nd, dev); | 331 | fill_ebus_device(nd, dev); |
| 332 | 332 | ||
| @@ -335,8 +335,8 @@ void __init ebus_init(void) | |||
| 335 | ebus_alloc(sizeof(struct linux_ebus_device)); | 335 | ebus_alloc(sizeof(struct linux_ebus_device)); |
| 336 | 336 | ||
| 337 | dev = dev->next; | 337 | dev = dev->next; |
| 338 | dev->next = 0; | 338 | dev->next = NULL; |
| 339 | dev->children = 0; | 339 | dev->children = NULL; |
| 340 | dev->bus = ebus; | 340 | dev->bus = ebus; |
| 341 | fill_ebus_device(nd, dev); | 341 | fill_ebus_device(nd, dev); |
| 342 | } | 342 | } |
| @@ -353,7 +353,7 @@ void __init ebus_init(void) | |||
| 353 | ebus->next = (struct linux_ebus *) | 353 | ebus->next = (struct linux_ebus *) |
| 354 | ebus_alloc(sizeof(struct linux_ebus)); | 354 | ebus_alloc(sizeof(struct linux_ebus)); |
| 355 | ebus = ebus->next; | 355 | ebus = ebus->next; |
| 356 | ebus->next = 0; | 356 | ebus->next = NULL; |
| 357 | ++num_ebus; | 357 | ++num_ebus; |
| 358 | } | 358 | } |
| 359 | if (pdev) | 359 | if (pdev) |
