.. | .. |
---|
22 | 22 | |
---|
23 | 23 | static int of_bus_pci_match(struct device_node *np) |
---|
24 | 24 | { |
---|
25 | | - if (!strcmp(np->type, "pci") || !strcmp(np->type, "pciex")) { |
---|
| 25 | + if (of_node_is_type(np, "pci") || of_node_is_type(np, "pciex")) { |
---|
26 | 26 | /* Do not do PCI specific frobbing if the |
---|
27 | 27 | * PCI bridge lacks a ranges property. We |
---|
28 | 28 | * want to pass it through up to the next |
---|
.. | .. |
---|
107 | 107 | |
---|
108 | 108 | static int of_bus_ambapp_match(struct device_node *np) |
---|
109 | 109 | { |
---|
110 | | - return !strcmp(np->type, "ambapp"); |
---|
| 110 | + return of_node_is_type(np, "ambapp"); |
---|
111 | 111 | } |
---|
112 | 112 | |
---|
113 | 113 | static void of_bus_ambapp_count_cells(struct device_node *child, |
---|
.. | .. |
---|
232 | 232 | * But, we should still pass the translation work up |
---|
233 | 233 | * to the SBUS itself. |
---|
234 | 234 | */ |
---|
235 | | - if (!strcmp(pp->name, "dma") || |
---|
236 | | - !strcmp(pp->name, "espdma") || |
---|
237 | | - !strcmp(pp->name, "ledma") || |
---|
238 | | - !strcmp(pp->name, "lebuffer")) |
---|
| 235 | + if (of_node_name_eq(pp, "dma") || |
---|
| 236 | + of_node_name_eq(pp, "espdma") || |
---|
| 237 | + of_node_name_eq(pp, "ledma") || |
---|
| 238 | + of_node_name_eq(pp, "lebuffer")) |
---|
239 | 239 | return 0; |
---|
240 | 240 | |
---|
241 | 241 | return 1; |
---|
.. | .. |
---|
324 | 324 | memset(r, 0, sizeof(*r)); |
---|
325 | 325 | |
---|
326 | 326 | if (of_resource_verbose) |
---|
327 | | - printk("%s reg[%d] -> %llx\n", |
---|
328 | | - op->dev.of_node->full_name, index, |
---|
| 327 | + printk("%pOF reg[%d] -> %llx\n", |
---|
| 328 | + op->dev.of_node, index, |
---|
329 | 329 | result); |
---|
330 | 330 | |
---|
331 | 331 | if (result != OF_BAD_ADDR) { |
---|
.. | .. |
---|
333 | 333 | r->end = result + size - 1; |
---|
334 | 334 | r->flags = flags | ((result >> 32ULL) & 0xffUL); |
---|
335 | 335 | } |
---|
336 | | - r->name = op->dev.of_node->name; |
---|
| 336 | + r->name = op->dev.of_node->full_name; |
---|
337 | 337 | } |
---|
338 | 338 | } |
---|
339 | 339 | |
---|
.. | .. |
---|
386 | 386 | op->dev.dma_mask = &op->dev.coherent_dma_mask; |
---|
387 | 387 | |
---|
388 | 388 | if (of_device_register(op)) { |
---|
389 | | - printk("%s: Could not register of device.\n", |
---|
390 | | - dp->full_name); |
---|
| 389 | + printk("%pOF: Could not register of device.\n", dp); |
---|
391 | 390 | kfree(op); |
---|
392 | 391 | op = NULL; |
---|
393 | 392 | } |
---|