hc
2024-05-10 748e4f3d702def1a4bff191e0cf93b6a05340f01
kernel/arch/sparc/kernel/of_device_64.c
....@@ -46,7 +46,7 @@
4646
4747 static int of_bus_pci_match(struct device_node *np)
4848 {
49
- if (!strcmp(np->name, "pci")) {
49
+ if (of_node_name_eq(np, "pci")) {
5050 const char *model = of_get_property(np, "model", NULL);
5151
5252 if (model && !strcmp(model, "SUNW,simba"))
....@@ -77,7 +77,7 @@
7777 /* Treat PCI busses lacking ranges property just like
7878 * simba.
7979 */
80
- if (!strcmp(np->name, "pci")) {
80
+ if (of_node_name_eq(np, "pci")) {
8181 if (!of_find_property(np, "ranges", NULL))
8282 return 1;
8383 }
....@@ -170,8 +170,8 @@
170170 */
171171 static int of_bus_fhc_match(struct device_node *np)
172172 {
173
- return !strcmp(np->name, "fhc") ||
174
- !strcmp(np->name, "central");
173
+ return of_node_name_eq(np, "fhc") ||
174
+ of_node_name_eq(np, "central");
175175 }
176176
177177 #define of_bus_fhc_count_cells of_bus_sbus_count_cells
....@@ -295,17 +295,17 @@
295295 * But, we should still pass the translation work up
296296 * to the SBUS itself.
297297 */
298
- if (!strcmp(pp->name, "dma") ||
299
- !strcmp(pp->name, "espdma") ||
300
- !strcmp(pp->name, "ledma") ||
301
- !strcmp(pp->name, "lebuffer"))
298
+ if (of_node_name_eq(pp, "dma") ||
299
+ of_node_name_eq(pp, "espdma") ||
300
+ of_node_name_eq(pp, "ledma") ||
301
+ of_node_name_eq(pp, "lebuffer"))
302302 return 0;
303303
304304 /* Similarly for all PCI bridges, if we get this far
305305 * it lacks a ranges property, and this will include
306306 * cases like Simba.
307307 */
308
- if (!strcmp(pp->name, "pci"))
308
+ if (of_node_name_eq(pp, "pci"))
309309 return 0;
310310
311311 return 1;
....@@ -341,9 +341,9 @@
341341
342342 /* Prevent overrunning the op->resources[] array. */
343343 if (num_reg > PROMREG_MAX) {
344
- printk(KERN_WARNING "%s: Too many regs (%d), "
344
+ printk(KERN_WARNING "%pOF: Too many regs (%d), "
345345 "limiting to %d.\n",
346
- op->dev.of_node->full_name, num_reg, PROMREG_MAX);
346
+ op->dev.of_node, num_reg, PROMREG_MAX);
347347 num_reg = PROMREG_MAX;
348348 }
349349
....@@ -401,8 +401,8 @@
401401 memset(r, 0, sizeof(*r));
402402
403403 if (of_resource_verbose)
404
- printk("%s reg[%d] -> %llx\n",
405
- op->dev.of_node->full_name, index,
404
+ printk("%pOF reg[%d] -> %llx\n",
405
+ op->dev.of_node, index,
406406 result);
407407
408408 if (result != OF_BAD_ADDR) {
....@@ -413,7 +413,7 @@
413413 r->end = result + size - 1;
414414 r->flags = flags;
415415 }
416
- r->name = op->dev.of_node->name;
416
+ r->name = op->dev.of_node->full_name;
417417 }
418418 }
419419
....@@ -548,8 +548,8 @@
548548 dp->irq_trans->data);
549549
550550 if (of_irq_verbose)
551
- printk("%s: direct translate %x --> %x\n",
552
- dp->full_name, orig_irq, irq);
551
+ printk("%pOF: direct translate %x --> %x\n",
552
+ dp, orig_irq, irq);
553553
554554 goto out;
555555 }
....@@ -579,10 +579,9 @@
579579 &irq);
580580
581581 if (of_irq_verbose)
582
- printk("%s: Apply [%s:%x] imap --> [%s:%x]\n",
583
- op->dev.of_node->full_name,
584
- pp->full_name, this_orig_irq,
585
- of_node_full_name(iret), irq);
582
+ printk("%pOF: Apply [%pOF:%x] imap --> [%pOF:%x]\n",
583
+ op->dev.of_node,
584
+ pp, this_orig_irq, iret, irq);
586585
587586 if (!iret)
588587 break;
....@@ -592,15 +591,15 @@
592591 break;
593592 }
594593 } else {
595
- if (!strcmp(pp->name, "pci")) {
594
+ if (of_node_name_eq(pp, "pci")) {
596595 unsigned int this_orig_irq = irq;
597596
598597 irq = pci_irq_swizzle(dp, pp, irq);
599598 if (of_irq_verbose)
600
- printk("%s: PCI swizzle [%s] "
599
+ printk("%pOF: PCI swizzle [%pOF] "
601600 "%x --> %x\n",
602
- op->dev.of_node->full_name,
603
- pp->full_name, this_orig_irq,
601
+ op->dev.of_node,
602
+ pp, this_orig_irq,
604603 irq);
605604
606605 }
....@@ -619,8 +618,8 @@
619618 irq = ip->irq_trans->irq_build(op->dev.of_node, irq,
620619 ip->irq_trans->data);
621620 if (of_irq_verbose)
622
- printk("%s: Apply IRQ trans [%s] %x --> %x\n",
623
- op->dev.of_node->full_name, ip->full_name, orig_irq, irq);
621
+ printk("%pOF: Apply IRQ trans [%pOF] %x --> %x\n",
622
+ op->dev.of_node, ip, orig_irq, irq);
624623
625624 out:
626625 nid = of_node_to_nid(dp);
....@@ -656,9 +655,9 @@
656655
657656 /* Prevent overrunning the op->irqs[] array. */
658657 if (op->archdata.num_irqs > PROMINTR_MAX) {
659
- printk(KERN_WARNING "%s: Too many irqs (%d), "
658
+ printk(KERN_WARNING "%pOF: Too many irqs (%d), "
660659 "limiting to %d.\n",
661
- dp->full_name, op->archdata.num_irqs, PROMINTR_MAX);
660
+ dp, op->archdata.num_irqs, PROMINTR_MAX);
662661 op->archdata.num_irqs = PROMINTR_MAX;
663662 }
664663 memcpy(op->archdata.irqs, irq, op->archdata.num_irqs * 4);
....@@ -680,8 +679,7 @@
680679 op->dev.dma_mask = &op->dev.coherent_dma_mask;
681680
682681 if (of_device_register(op)) {
683
- printk("%s: Could not register of device.\n",
684
- dp->full_name);
682
+ printk("%pOF: Could not register of device.\n", dp);
685683 kfree(op);
686684 op = NULL;
687685 }