.. | .. |
---|
335 | 335 | |
---|
336 | 336 | irq = real_irq; |
---|
337 | 337 | while (bus) { |
---|
338 | | - if (!strcmp(bus->name, "sbi")) { |
---|
| 338 | + if (of_node_name_eq(bus, "sbi")) { |
---|
339 | 339 | bus_connection = "io-unit"; |
---|
340 | 340 | break; |
---|
341 | 341 | } |
---|
342 | 342 | |
---|
343 | | - if (!strcmp(bus->name, "bootbus")) { |
---|
| 343 | + if (of_node_name_eq(bus, "bootbus")) { |
---|
344 | 344 | bus_connection = "cpu-unit"; |
---|
345 | 345 | break; |
---|
346 | 346 | } |
---|
.. | .. |
---|
360 | 360 | * If Bus nodes parent is not io-unit/cpu-unit or the io-unit/cpu-unit |
---|
361 | 361 | * lacks a "board#" property, something is very wrong. |
---|
362 | 362 | */ |
---|
363 | | - if (!bus->parent || strcmp(bus->parent->name, bus_connection)) { |
---|
364 | | - printk(KERN_ERR "%s: Error, parent is not %s.\n", |
---|
365 | | - bus->full_name, bus_connection); |
---|
| 363 | + if (!of_node_name_eq(bus->parent, bus_connection)) { |
---|
| 364 | + printk(KERN_ERR "%pOF: Error, parent is not %s.\n", |
---|
| 365 | + bus, bus_connection); |
---|
366 | 366 | goto err_out; |
---|
367 | 367 | } |
---|
368 | 368 | board_parent = bus->parent; |
---|
369 | 369 | board = of_getintprop_default(board_parent, "board#", -1); |
---|
370 | 370 | if (board == -1) { |
---|
371 | | - printk(KERN_ERR "%s: Error, lacks board# property.\n", |
---|
372 | | - board_parent->full_name); |
---|
| 371 | + printk(KERN_ERR "%pOF: Error, lacks board# property.\n", |
---|
| 372 | + board_parent); |
---|
373 | 373 | goto err_out; |
---|
374 | 374 | } |
---|
375 | 375 | |
---|