Merge tag 'dt-for-3.6' of git://sources.calxeda.com/kernel/linux
Pull devicetree updates from Rob Herring: "A small set of changes for devicetree: - Couple of Documentation fixes - Addition of new helper function of_node_full_name - Improve of_parse_phandle_with_args return values - Some NULL related sparse fixes" Grant's busy packing. * tag 'dt-for-3.6' of git://sources.calxeda.com/kernel/linux: of: mtd: nuke useless const qualifier devicetree: add helper inline for retrieving a node's full name of: return -ENOENT when no property usage-model.txt: fix typo machine_init->init_machine of: Fix null pointer related warnings in base.c file LED: Fix missing semicolon in OF documentation of: fix a few typos in the binding documentation
This commit is contained in:
@@ -448,7 +448,7 @@ unsigned int irq_create_mapping(struct irq_domain *domain,
|
||||
}
|
||||
|
||||
pr_debug("irq %lu on domain %s mapped to virtual irq %u\n",
|
||||
hwirq, domain->of_node ? domain->of_node->full_name : "null", virq);
|
||||
hwirq, of_node_full_name(domain->of_node), virq);
|
||||
|
||||
return virq;
|
||||
}
|
||||
@@ -477,7 +477,7 @@ unsigned int irq_create_of_mapping(struct device_node *controller,
|
||||
return intspec[0];
|
||||
#endif
|
||||
pr_warning("no irq domain found for %s !\n",
|
||||
controller->full_name);
|
||||
of_node_full_name(controller));
|
||||
return 0;
|
||||
}
|
||||
|
||||
@@ -725,8 +725,8 @@ static int virq_debug_show(struct seq_file *m, void *private)
|
||||
data = irq_desc_get_chip_data(desc);
|
||||
seq_printf(m, data ? "0x%p " : " %p ", data);
|
||||
|
||||
if (desc->irq_data.domain && desc->irq_data.domain->of_node)
|
||||
p = desc->irq_data.domain->of_node->full_name;
|
||||
if (desc->irq_data.domain)
|
||||
p = of_node_full_name(desc->irq_data.domain->of_node);
|
||||
else
|
||||
p = none;
|
||||
seq_printf(m, "%s\n", p);
|
||||
|
Reference in New Issue
Block a user