diff options
author | Rob Herring <robh@kernel.org> | 2017-07-18 17:43:10 -0400 |
---|---|---|
committer | Marc Zyngier <marc.zyngier@arm.com> | 2017-08-23 05:09:28 -0400 |
commit | e81f54c668d89e50bad38f3fc4c5ea6e4be3a96e (patch) | |
tree | 56ee86852e5af42ad42eb7d17c6ddc2f8fb935a9 | |
parent | 5ed34d3a4387c8967801688f66b90ce0c7facda0 (diff) |
irqchip: Convert to using %pOF instead of full_name
Now that we have a custom printf format specifier, convert users of
full_name to use %pOF instead. This is preparation to remove storing
of the full path string for each node.
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Jason Cooper <jason@lakedaemon.net>
Cc: Lee Jones <lee@kernel.org>
Cc: Stefan Wahren <stefan.wahren@i2se.com>
Cc: Florian Fainelli <f.fainelli@gmail.com>
Cc: Ray Jui <rjui@broadcom.com>
Cc: Scott Branden <sbranden@broadcom.com>
Cc: bcm-kernel-feedback-list@broadcom.com
Cc: Sylvain Lemieux <slemieux.tyco@gmail.com>
Cc: Maxime Coquelin <mcoquelin.stm32@gmail.com>
Cc: Chen-Yu Tsai <wens@csie.org>
Cc: Thierry Reding <thierry.reding@gmail.com>
Cc: Jonathan Hunter <jonathanh@nvidia.com>
Cc: Michal Simek <michal.simek@xilinx.com>
Cc: "Sören Brinkmann" <soren.brinkmann@xilinx.com>
Cc: linux-rpi-kernel@lists.infradead.org
Cc: linux-arm-kernel@lists.infradead.org
Cc: linux-mediatek@lists.infradead.org
Cc: linux-tegra@vger.kernel.org
Acked-by: Eric Anholt <eric@anholt.net>
Acked-by: Baruch Siach <baruch@tkos.co.il>
Acked-by: Vladimir Zapolskiy <vz@mleia.com>
Acked-by: Matthias Brugger <matthias.bgg@gmail.com>
Acked-by: Alexandre Torgue <alexandre.torgue@st.com>
Acked-by: Maxime Ripard <maxime.ripard@free-electrons.com>
Signed-off-by: Rob Herring <robh@kernel.org>
Signed-off-by: Marc Zyngier <marc.zyngier@arm.com>
-rw-r--r-- | drivers/irqchip/irq-bcm2835.c | 9 | ||||
-rw-r--r-- | drivers/irqchip/irq-bcm2836.c | 5 | ||||
-rw-r--r-- | drivers/irqchip/irq-crossbar.c | 6 | ||||
-rw-r--r-- | drivers/irqchip/irq-digicolor.c | 8 | ||||
-rw-r--r-- | drivers/irqchip/irq-dw-apb-ictl.c | 12 | ||||
-rw-r--r-- | drivers/irqchip/irq-gic-v3-its-pci-msi.c | 2 | ||||
-rw-r--r-- | drivers/irqchip/irq-gic-v3-its.c | 6 | ||||
-rw-r--r-- | drivers/irqchip/irq-gic-v3.c | 11 | ||||
-rw-r--r-- | drivers/irqchip/irq-imx-gpcv2.c | 4 | ||||
-rw-r--r-- | drivers/irqchip/irq-lpc32xx.c | 2 | ||||
-rw-r--r-- | drivers/irqchip/irq-mtk-sysirq.c | 3 | ||||
-rw-r--r-- | drivers/irqchip/irq-mxs.c | 4 | ||||
-rw-r--r-- | drivers/irqchip/irq-stm32-exti.c | 8 | ||||
-rw-r--r-- | drivers/irqchip/irq-sun4i.c | 6 | ||||
-rw-r--r-- | drivers/irqchip/irq-tegra.c | 16 | ||||
-rw-r--r-- | drivers/irqchip/irq-xilinx-intc.c | 4 |
16 files changed, 50 insertions, 56 deletions
diff --git a/drivers/irqchip/irq-bcm2835.c b/drivers/irqchip/irq-bcm2835.c index 44d7c38dde47..d2da8a1e6b1b 100644 --- a/drivers/irqchip/irq-bcm2835.c +++ b/drivers/irqchip/irq-bcm2835.c | |||
@@ -147,13 +147,12 @@ static int __init armctrl_of_init(struct device_node *node, | |||
147 | 147 | ||
148 | base = of_iomap(node, 0); | 148 | base = of_iomap(node, 0); |
149 | if (!base) | 149 | if (!base) |
150 | panic("%s: unable to map IC registers\n", | 150 | panic("%pOF: unable to map IC registers\n", node); |
151 | node->full_name); | ||
152 | 151 | ||
153 | intc.domain = irq_domain_add_linear(node, MAKE_HWIRQ(NR_BANKS, 0), | 152 | intc.domain = irq_domain_add_linear(node, MAKE_HWIRQ(NR_BANKS, 0), |
154 | &armctrl_ops, NULL); | 153 | &armctrl_ops, NULL); |
155 | if (!intc.domain) | 154 | if (!intc.domain) |
156 | panic("%s: unable to create IRQ domain\n", node->full_name); | 155 | panic("%pOF: unable to create IRQ domain\n", node); |
157 | 156 | ||
158 | for (b = 0; b < NR_BANKS; b++) { | 157 | for (b = 0; b < NR_BANKS; b++) { |
159 | intc.pending[b] = base + reg_pending[b]; | 158 | intc.pending[b] = base + reg_pending[b]; |
@@ -173,8 +172,8 @@ static int __init armctrl_of_init(struct device_node *node, | |||
173 | int parent_irq = irq_of_parse_and_map(node, 0); | 172 | int parent_irq = irq_of_parse_and_map(node, 0); |
174 | 173 | ||
175 | if (!parent_irq) { | 174 | if (!parent_irq) { |
176 | panic("%s: unable to get parent interrupt.\n", | 175 | panic("%pOF: unable to get parent interrupt.\n", |
177 | node->full_name); | 176 | node); |
178 | } | 177 | } |
179 | irq_set_chained_handler(parent_irq, bcm2836_chained_handle_irq); | 178 | irq_set_chained_handler(parent_irq, bcm2836_chained_handle_irq); |
180 | } else { | 179 | } else { |
diff --git a/drivers/irqchip/irq-bcm2836.c b/drivers/irqchip/irq-bcm2836.c index e7463e3c0814..dc8c1e3eafe7 100644 --- a/drivers/irqchip/irq-bcm2836.c +++ b/drivers/irqchip/irq-bcm2836.c | |||
@@ -282,8 +282,7 @@ static int __init bcm2836_arm_irqchip_l1_intc_of_init(struct device_node *node, | |||
282 | { | 282 | { |
283 | intc.base = of_iomap(node, 0); | 283 | intc.base = of_iomap(node, 0); |
284 | if (!intc.base) { | 284 | if (!intc.base) { |
285 | panic("%s: unable to map local interrupt registers\n", | 285 | panic("%pOF: unable to map local interrupt registers\n", node); |
286 | node->full_name); | ||
287 | } | 286 | } |
288 | 287 | ||
289 | bcm2835_init_local_timer_frequency(); | 288 | bcm2835_init_local_timer_frequency(); |
@@ -292,7 +291,7 @@ static int __init bcm2836_arm_irqchip_l1_intc_of_init(struct device_node *node, | |||
292 | &bcm2836_arm_irqchip_intc_ops, | 291 | &bcm2836_arm_irqchip_intc_ops, |
293 | NULL); | 292 | NULL); |
294 | if (!intc.domain) | 293 | if (!intc.domain) |
295 | panic("%s: unable to create IRQ domain\n", node->full_name); | 294 | panic("%pOF: unable to create IRQ domain\n", node); |
296 | 295 | ||
297 | bcm2836_arm_irqchip_register_irq(LOCAL_IRQ_CNTPSIRQ, | 296 | bcm2836_arm_irqchip_register_irq(LOCAL_IRQ_CNTPSIRQ, |
298 | &bcm2836_arm_irqchip_timer); | 297 | &bcm2836_arm_irqchip_timer); |
diff --git a/drivers/irqchip/irq-crossbar.c b/drivers/irqchip/irq-crossbar.c index f96601268f71..99d97d7e3fd7 100644 --- a/drivers/irqchip/irq-crossbar.c +++ b/drivers/irqchip/irq-crossbar.c | |||
@@ -341,13 +341,13 @@ static int __init irqcrossbar_init(struct device_node *node, | |||
341 | int err; | 341 | int err; |
342 | 342 | ||
343 | if (!parent) { | 343 | if (!parent) { |
344 | pr_err("%s: no parent, giving up\n", node->full_name); | 344 | pr_err("%pOF: no parent, giving up\n", node); |
345 | return -ENODEV; | 345 | return -ENODEV; |
346 | } | 346 | } |
347 | 347 | ||
348 | parent_domain = irq_find_host(parent); | 348 | parent_domain = irq_find_host(parent); |
349 | if (!parent_domain) { | 349 | if (!parent_domain) { |
350 | pr_err("%s: unable to obtain parent domain\n", node->full_name); | 350 | pr_err("%pOF: unable to obtain parent domain\n", node); |
351 | return -ENXIO; | 351 | return -ENXIO; |
352 | } | 352 | } |
353 | 353 | ||
@@ -360,7 +360,7 @@ static int __init irqcrossbar_init(struct device_node *node, | |||
360 | node, &crossbar_domain_ops, | 360 | node, &crossbar_domain_ops, |
361 | NULL); | 361 | NULL); |
362 | if (!domain) { | 362 | if (!domain) { |
363 | pr_err("%s: failed to allocated domain\n", node->full_name); | 363 | pr_err("%pOF: failed to allocated domain\n", node); |
364 | return -ENOMEM; | 364 | return -ENOMEM; |
365 | } | 365 | } |
366 | 366 | ||
diff --git a/drivers/irqchip/irq-digicolor.c b/drivers/irqchip/irq-digicolor.c index 3aae015469a5..fc38d2da11b9 100644 --- a/drivers/irqchip/irq-digicolor.c +++ b/drivers/irqchip/irq-digicolor.c | |||
@@ -78,7 +78,7 @@ static int __init digicolor_of_init(struct device_node *node, | |||
78 | 78 | ||
79 | reg_base = of_iomap(node, 0); | 79 | reg_base = of_iomap(node, 0); |
80 | if (!reg_base) { | 80 | if (!reg_base) { |
81 | pr_err("%s: unable to map IC registers\n", node->full_name); | 81 | pr_err("%pOF: unable to map IC registers\n", node); |
82 | return -ENXIO; | 82 | return -ENXIO; |
83 | } | 83 | } |
84 | 84 | ||
@@ -88,7 +88,7 @@ static int __init digicolor_of_init(struct device_node *node, | |||
88 | 88 | ||
89 | ucregs = syscon_regmap_lookup_by_phandle(node, "syscon"); | 89 | ucregs = syscon_regmap_lookup_by_phandle(node, "syscon"); |
90 | if (IS_ERR(ucregs)) { | 90 | if (IS_ERR(ucregs)) { |
91 | pr_err("%s: unable to map UC registers\n", node->full_name); | 91 | pr_err("%pOF: unable to map UC registers\n", node); |
92 | return PTR_ERR(ucregs); | 92 | return PTR_ERR(ucregs); |
93 | } | 93 | } |
94 | /* channel 1, regular IRQs */ | 94 | /* channel 1, regular IRQs */ |
@@ -97,7 +97,7 @@ static int __init digicolor_of_init(struct device_node *node, | |||
97 | digicolor_irq_domain = | 97 | digicolor_irq_domain = |
98 | irq_domain_add_linear(node, 64, &irq_generic_chip_ops, NULL); | 98 | irq_domain_add_linear(node, 64, &irq_generic_chip_ops, NULL); |
99 | if (!digicolor_irq_domain) { | 99 | if (!digicolor_irq_domain) { |
100 | pr_err("%s: unable to create IRQ domain\n", node->full_name); | 100 | pr_err("%pOF: unable to create IRQ domain\n", node); |
101 | return -ENOMEM; | 101 | return -ENOMEM; |
102 | } | 102 | } |
103 | 103 | ||
@@ -105,7 +105,7 @@ static int __init digicolor_of_init(struct device_node *node, | |||
105 | "digicolor_irq", handle_level_irq, | 105 | "digicolor_irq", handle_level_irq, |
106 | clr, 0, 0); | 106 | clr, 0, 0); |
107 | if (ret) { | 107 | if (ret) { |
108 | pr_err("%s: unable to allocate IRQ gc\n", node->full_name); | 108 | pr_err("%pOF: unable to allocate IRQ gc\n", node); |
109 | return ret; | 109 | return ret; |
110 | } | 110 | } |
111 | 111 | ||
diff --git a/drivers/irqchip/irq-dw-apb-ictl.c b/drivers/irqchip/irq-dw-apb-ictl.c index 052f266364c0..0a19618ce2c8 100644 --- a/drivers/irqchip/irq-dw-apb-ictl.c +++ b/drivers/irqchip/irq-dw-apb-ictl.c | |||
@@ -79,24 +79,24 @@ static int __init dw_apb_ictl_init(struct device_node *np, | |||
79 | /* Map the parent interrupt for the chained handler */ | 79 | /* Map the parent interrupt for the chained handler */ |
80 | irq = irq_of_parse_and_map(np, 0); | 80 | irq = irq_of_parse_and_map(np, 0); |
81 | if (irq <= 0) { | 81 | if (irq <= 0) { |
82 | pr_err("%s: unable to parse irq\n", np->full_name); | 82 | pr_err("%pOF: unable to parse irq\n", np); |
83 | return -EINVAL; | 83 | return -EINVAL; |
84 | } | 84 | } |
85 | 85 | ||
86 | ret = of_address_to_resource(np, 0, &r); | 86 | ret = of_address_to_resource(np, 0, &r); |
87 | if (ret) { | 87 | if (ret) { |
88 | pr_err("%s: unable to get resource\n", np->full_name); | 88 | pr_err("%pOF: unable to get resource\n", np); |
89 | return ret; | 89 | return ret; |
90 | } | 90 | } |
91 | 91 | ||
92 | if (!request_mem_region(r.start, resource_size(&r), np->full_name)) { | 92 | if (!request_mem_region(r.start, resource_size(&r), np->full_name)) { |
93 | pr_err("%s: unable to request mem region\n", np->full_name); | 93 | pr_err("%pOF: unable to request mem region\n", np); |
94 | return -ENOMEM; | 94 | return -ENOMEM; |
95 | } | 95 | } |
96 | 96 | ||
97 | iobase = ioremap(r.start, resource_size(&r)); | 97 | iobase = ioremap(r.start, resource_size(&r)); |
98 | if (!iobase) { | 98 | if (!iobase) { |
99 | pr_err("%s: unable to map resource\n", np->full_name); | 99 | pr_err("%pOF: unable to map resource\n", np); |
100 | ret = -ENOMEM; | 100 | ret = -ENOMEM; |
101 | goto err_release; | 101 | goto err_release; |
102 | } | 102 | } |
@@ -123,7 +123,7 @@ static int __init dw_apb_ictl_init(struct device_node *np, | |||
123 | domain = irq_domain_add_linear(np, nrirqs, | 123 | domain = irq_domain_add_linear(np, nrirqs, |
124 | &irq_generic_chip_ops, NULL); | 124 | &irq_generic_chip_ops, NULL); |
125 | if (!domain) { | 125 | if (!domain) { |
126 | pr_err("%s: unable to add irq domain\n", np->full_name); | 126 | pr_err("%pOF: unable to add irq domain\n", np); |
127 | ret = -ENOMEM; | 127 | ret = -ENOMEM; |
128 | goto err_unmap; | 128 | goto err_unmap; |
129 | } | 129 | } |
@@ -132,7 +132,7 @@ static int __init dw_apb_ictl_init(struct device_node *np, | |||
132 | handle_level_irq, clr, 0, | 132 | handle_level_irq, clr, 0, |
133 | IRQ_GC_INIT_MASK_CACHE); | 133 | IRQ_GC_INIT_MASK_CACHE); |
134 | if (ret) { | 134 | if (ret) { |
135 | pr_err("%s: unable to alloc irq domain gc\n", np->full_name); | 135 | pr_err("%pOF: unable to alloc irq domain gc\n", np); |
136 | goto err_unmap; | 136 | goto err_unmap; |
137 | } | 137 | } |
138 | 138 | ||
diff --git a/drivers/irqchip/irq-gic-v3-its-pci-msi.c b/drivers/irqchip/irq-gic-v3-its-pci-msi.c index 77931214d954..14a8c0a7e095 100644 --- a/drivers/irqchip/irq-gic-v3-its-pci-msi.c +++ b/drivers/irqchip/irq-gic-v3-its-pci-msi.c | |||
@@ -138,7 +138,7 @@ static int __init its_pci_of_msi_init(void) | |||
138 | if (its_pci_msi_init_one(of_node_to_fwnode(np), np->full_name)) | 138 | if (its_pci_msi_init_one(of_node_to_fwnode(np), np->full_name)) |
139 | continue; | 139 | continue; |
140 | 140 | ||
141 | pr_info("PCI/MSI: %s domain created\n", np->full_name); | 141 | pr_info("PCI/MSI: %pOF domain created\n", np); |
142 | } | 142 | } |
143 | 143 | ||
144 | return 0; | 144 | return 0; |
diff --git a/drivers/irqchip/irq-gic-v3-its.c b/drivers/irqchip/irq-gic-v3-its.c index 350a959da6dd..b93bd5a91e92 100644 --- a/drivers/irqchip/irq-gic-v3-its.c +++ b/drivers/irqchip/irq-gic-v3-its.c | |||
@@ -1822,13 +1822,13 @@ static int __init its_of_probe(struct device_node *node) | |||
1822 | for (np = of_find_matching_node(node, its_device_id); np; | 1822 | for (np = of_find_matching_node(node, its_device_id); np; |
1823 | np = of_find_matching_node(np, its_device_id)) { | 1823 | np = of_find_matching_node(np, its_device_id)) { |
1824 | if (!of_property_read_bool(np, "msi-controller")) { | 1824 | if (!of_property_read_bool(np, "msi-controller")) { |
1825 | pr_warn("%s: no msi-controller property, ITS ignored\n", | 1825 | pr_warn("%pOF: no msi-controller property, ITS ignored\n", |
1826 | np->full_name); | 1826 | np); |
1827 | continue; | 1827 | continue; |
1828 | } | 1828 | } |
1829 | 1829 | ||
1830 | if (of_address_to_resource(np, 0, &res)) { | 1830 | if (of_address_to_resource(np, 0, &res)) { |
1831 | pr_warn("%s: no regs?\n", np->full_name); | 1831 | pr_warn("%pOF: no regs?\n", np); |
1832 | continue; | 1832 | continue; |
1833 | } | 1833 | } |
1834 | 1834 | ||
diff --git a/drivers/irqchip/irq-gic-v3.c b/drivers/irqchip/irq-gic-v3.c index dbffb7ab6203..afae0a9d0df9 100644 --- a/drivers/irqchip/irq-gic-v3.c +++ b/drivers/irqchip/irq-gic-v3.c | |||
@@ -1057,7 +1057,7 @@ static void __init gic_populate_ppi_partitions(struct device_node *gic_node) | |||
1057 | if (WARN_ON(cpu == -1)) | 1057 | if (WARN_ON(cpu == -1)) |
1058 | continue; | 1058 | continue; |
1059 | 1059 | ||
1060 | pr_cont("%s[%d] ", cpu_node->full_name, cpu); | 1060 | pr_cont("%pOF[%d] ", cpu_node, cpu); |
1061 | 1061 | ||
1062 | cpumask_set_cpu(cpu, &part->mask); | 1062 | cpumask_set_cpu(cpu, &part->mask); |
1063 | } | 1063 | } |
@@ -1125,15 +1125,13 @@ static int __init gic_of_init(struct device_node *node, struct device_node *pare | |||
1125 | 1125 | ||
1126 | dist_base = of_iomap(node, 0); | 1126 | dist_base = of_iomap(node, 0); |
1127 | if (!dist_base) { | 1127 | if (!dist_base) { |
1128 | pr_err("%s: unable to map gic dist registers\n", | 1128 | pr_err("%pOF: unable to map gic dist registers\n", node); |
1129 | node->full_name); | ||
1130 | return -ENXIO; | 1129 | return -ENXIO; |
1131 | } | 1130 | } |
1132 | 1131 | ||
1133 | err = gic_validate_dist_version(dist_base); | 1132 | err = gic_validate_dist_version(dist_base); |
1134 | if (err) { | 1133 | if (err) { |
1135 | pr_err("%s: no distributor detected, giving up\n", | 1134 | pr_err("%pOF: no distributor detected, giving up\n", node); |
1136 | node->full_name); | ||
1137 | goto out_unmap_dist; | 1135 | goto out_unmap_dist; |
1138 | } | 1136 | } |
1139 | 1137 | ||
@@ -1153,8 +1151,7 @@ static int __init gic_of_init(struct device_node *node, struct device_node *pare | |||
1153 | ret = of_address_to_resource(node, 1 + i, &res); | 1151 | ret = of_address_to_resource(node, 1 + i, &res); |
1154 | rdist_regs[i].redist_base = of_iomap(node, 1 + i); | 1152 | rdist_regs[i].redist_base = of_iomap(node, 1 + i); |
1155 | if (ret || !rdist_regs[i].redist_base) { | 1153 | if (ret || !rdist_regs[i].redist_base) { |
1156 | pr_err("%s: couldn't map region %d\n", | 1154 | pr_err("%pOF: couldn't map region %d\n", node, i); |
1157 | node->full_name, i); | ||
1158 | err = -ENODEV; | 1155 | err = -ENODEV; |
1159 | goto out_unmap_rdist; | 1156 | goto out_unmap_rdist; |
1160 | } | 1157 | } |
diff --git a/drivers/irqchip/irq-imx-gpcv2.c b/drivers/irqchip/irq-imx-gpcv2.c index bb36f572e322..675eda5ff2b8 100644 --- a/drivers/irqchip/irq-imx-gpcv2.c +++ b/drivers/irqchip/irq-imx-gpcv2.c | |||
@@ -214,13 +214,13 @@ static int __init imx_gpcv2_irqchip_init(struct device_node *node, | |||
214 | int i; | 214 | int i; |
215 | 215 | ||
216 | if (!parent) { | 216 | if (!parent) { |
217 | pr_err("%s: no parent, giving up\n", node->full_name); | 217 | pr_err("%pOF: no parent, giving up\n", node); |
218 | return -ENODEV; | 218 | return -ENODEV; |
219 | } | 219 | } |
220 | 220 | ||
221 | parent_domain = irq_find_host(parent); | 221 | parent_domain = irq_find_host(parent); |
222 | if (!parent_domain) { | 222 | if (!parent_domain) { |
223 | pr_err("%s: unable to get parent domain\n", node->full_name); | 223 | pr_err("%pOF: unable to get parent domain\n", node); |
224 | return -ENXIO; | 224 | return -ENXIO; |
225 | } | 225 | } |
226 | 226 | ||
diff --git a/drivers/irqchip/irq-lpc32xx.c b/drivers/irqchip/irq-lpc32xx.c index 1034aeb2e98a..a48357d369b5 100644 --- a/drivers/irqchip/irq-lpc32xx.c +++ b/drivers/irqchip/irq-lpc32xx.c | |||
@@ -191,7 +191,7 @@ static int __init lpc32xx_of_ic_init(struct device_node *node, | |||
191 | 191 | ||
192 | irqc->base = of_iomap(node, 0); | 192 | irqc->base = of_iomap(node, 0); |
193 | if (!irqc->base) { | 193 | if (!irqc->base) { |
194 | pr_err("%s: unable to map registers\n", node->full_name); | 194 | pr_err("%pOF: unable to map registers\n", node); |
195 | kfree(irqc); | 195 | kfree(irqc); |
196 | return -EINVAL; | 196 | return -EINVAL; |
197 | } | 197 | } |
diff --git a/drivers/irqchip/irq-mtk-sysirq.c b/drivers/irqchip/irq-mtk-sysirq.c index eeac512ec5a8..90aaf190157f 100644 --- a/drivers/irqchip/irq-mtk-sysirq.c +++ b/drivers/irqchip/irq-mtk-sysirq.c | |||
@@ -178,8 +178,7 @@ static int __init mtk_sysirq_of_init(struct device_node *node, | |||
178 | chip_data->intpol_words[i] = size / 4; | 178 | chip_data->intpol_words[i] = size / 4; |
179 | chip_data->intpol_bases[i] = of_iomap(node, i); | 179 | chip_data->intpol_bases[i] = of_iomap(node, i); |
180 | if (ret || !chip_data->intpol_bases[i]) { | 180 | if (ret || !chip_data->intpol_bases[i]) { |
181 | pr_err("%s: couldn't map region %d\n", | 181 | pr_err("%pOF: couldn't map region %d\n", node, i); |
182 | node->full_name, i); | ||
183 | ret = -ENODEV; | 182 | ret = -ENODEV; |
184 | goto out_free_intpol; | 183 | goto out_free_intpol; |
185 | } | 184 | } |
diff --git a/drivers/irqchip/irq-mxs.c b/drivers/irqchip/irq-mxs.c index 05fa9f7af53c..e8b31f52e071 100644 --- a/drivers/irqchip/irq-mxs.c +++ b/drivers/irqchip/irq-mxs.c | |||
@@ -179,7 +179,7 @@ static void __init icoll_add_domain(struct device_node *np, | |||
179 | &icoll_irq_domain_ops, NULL); | 179 | &icoll_irq_domain_ops, NULL); |
180 | 180 | ||
181 | if (!icoll_domain) | 181 | if (!icoll_domain) |
182 | panic("%s: unable to create irq domain", np->full_name); | 182 | panic("%pOF: unable to create irq domain", np); |
183 | } | 183 | } |
184 | 184 | ||
185 | static void __iomem * __init icoll_init_iobase(struct device_node *np) | 185 | static void __iomem * __init icoll_init_iobase(struct device_node *np) |
@@ -188,7 +188,7 @@ static void __iomem * __init icoll_init_iobase(struct device_node *np) | |||
188 | 188 | ||
189 | icoll_base = of_io_request_and_map(np, 0, np->name); | 189 | icoll_base = of_io_request_and_map(np, 0, np->name); |
190 | if (IS_ERR(icoll_base)) | 190 | if (IS_ERR(icoll_base)) |
191 | panic("%s: unable to map resource", np->full_name); | 191 | panic("%pOF: unable to map resource", np); |
192 | return icoll_base; | 192 | return icoll_base; |
193 | } | 193 | } |
194 | 194 | ||
diff --git a/drivers/irqchip/irq-stm32-exti.c b/drivers/irqchip/irq-stm32-exti.c index 491568c95aa5..45363ff8d06f 100644 --- a/drivers/irqchip/irq-stm32-exti.c +++ b/drivers/irqchip/irq-stm32-exti.c | |||
@@ -140,7 +140,7 @@ static int __init stm32_exti_init(struct device_node *node, | |||
140 | 140 | ||
141 | base = of_iomap(node, 0); | 141 | base = of_iomap(node, 0); |
142 | if (!base) { | 142 | if (!base) { |
143 | pr_err("%s: Unable to map registers\n", node->full_name); | 143 | pr_err("%pOF: Unable to map registers\n", node); |
144 | return -ENOMEM; | 144 | return -ENOMEM; |
145 | } | 145 | } |
146 | 146 | ||
@@ -149,7 +149,7 @@ static int __init stm32_exti_init(struct device_node *node, | |||
149 | nr_exti = fls(readl_relaxed(base + EXTI_RTSR)); | 149 | nr_exti = fls(readl_relaxed(base + EXTI_RTSR)); |
150 | writel_relaxed(0, base + EXTI_RTSR); | 150 | writel_relaxed(0, base + EXTI_RTSR); |
151 | 151 | ||
152 | pr_info("%s: %d External IRQs detected\n", node->full_name, nr_exti); | 152 | pr_info("%pOF: %d External IRQs detected\n", node, nr_exti); |
153 | 153 | ||
154 | domain = irq_domain_add_linear(node, nr_exti, | 154 | domain = irq_domain_add_linear(node, nr_exti, |
155 | &irq_exti_domain_ops, NULL); | 155 | &irq_exti_domain_ops, NULL); |
@@ -163,8 +163,8 @@ static int __init stm32_exti_init(struct device_node *node, | |||
163 | ret = irq_alloc_domain_generic_chips(domain, nr_exti, 1, "exti", | 163 | ret = irq_alloc_domain_generic_chips(domain, nr_exti, 1, "exti", |
164 | handle_edge_irq, clr, 0, 0); | 164 | handle_edge_irq, clr, 0, 0); |
165 | if (ret) { | 165 | if (ret) { |
166 | pr_err("%s: Could not allocate generic interrupt chip.\n", | 166 | pr_err("%pOF: Could not allocate generic interrupt chip.\n", |
167 | node->full_name); | 167 | node); |
168 | goto out_free_domain; | 168 | goto out_free_domain; |
169 | } | 169 | } |
170 | 170 | ||
diff --git a/drivers/irqchip/irq-sun4i.c b/drivers/irqchip/irq-sun4i.c index 376b28074e0d..e3e5b9132b75 100644 --- a/drivers/irqchip/irq-sun4i.c +++ b/drivers/irqchip/irq-sun4i.c | |||
@@ -97,8 +97,8 @@ static int __init sun4i_of_init(struct device_node *node, | |||
97 | { | 97 | { |
98 | sun4i_irq_base = of_iomap(node, 0); | 98 | sun4i_irq_base = of_iomap(node, 0); |
99 | if (!sun4i_irq_base) | 99 | if (!sun4i_irq_base) |
100 | panic("%s: unable to map IC registers\n", | 100 | panic("%pOF: unable to map IC registers\n", |
101 | node->full_name); | 101 | node); |
102 | 102 | ||
103 | /* Disable all interrupts */ | 103 | /* Disable all interrupts */ |
104 | writel(0, sun4i_irq_base + SUN4I_IRQ_ENABLE_REG(0)); | 104 | writel(0, sun4i_irq_base + SUN4I_IRQ_ENABLE_REG(0)); |
@@ -124,7 +124,7 @@ static int __init sun4i_of_init(struct device_node *node, | |||
124 | sun4i_irq_domain = irq_domain_add_linear(node, 3 * 32, | 124 | sun4i_irq_domain = irq_domain_add_linear(node, 3 * 32, |
125 | &sun4i_irq_ops, NULL); | 125 | &sun4i_irq_ops, NULL); |
126 | if (!sun4i_irq_domain) | 126 | if (!sun4i_irq_domain) |
127 | panic("%s: unable to create IRQ domain\n", node->full_name); | 127 | panic("%pOF: unable to create IRQ domain\n", node); |
128 | 128 | ||
129 | set_handle_irq(sun4i_handle_irq); | 129 | set_handle_irq(sun4i_handle_irq); |
130 | 130 | ||
diff --git a/drivers/irqchip/irq-tegra.c b/drivers/irqchip/irq-tegra.c index 3973a14bb15b..0abc0cd1c32e 100644 --- a/drivers/irqchip/irq-tegra.c +++ b/drivers/irqchip/irq-tegra.c | |||
@@ -291,13 +291,13 @@ static int __init tegra_ictlr_init(struct device_node *node, | |||
291 | int err; | 291 | int err; |
292 | 292 | ||
293 | if (!parent) { | 293 | if (!parent) { |
294 | pr_err("%s: no parent, giving up\n", node->full_name); | 294 | pr_err("%pOF: no parent, giving up\n", node); |
295 | return -ENODEV; | 295 | return -ENODEV; |
296 | } | 296 | } |
297 | 297 | ||
298 | parent_domain = irq_find_host(parent); | 298 | parent_domain = irq_find_host(parent); |
299 | if (!parent_domain) { | 299 | if (!parent_domain) { |
300 | pr_err("%s: unable to obtain parent domain\n", node->full_name); | 300 | pr_err("%pOF: unable to obtain parent domain\n", node); |
301 | return -ENXIO; | 301 | return -ENXIO; |
302 | } | 302 | } |
303 | 303 | ||
@@ -329,29 +329,29 @@ static int __init tegra_ictlr_init(struct device_node *node, | |||
329 | } | 329 | } |
330 | 330 | ||
331 | if (!num_ictlrs) { | 331 | if (!num_ictlrs) { |
332 | pr_err("%s: no valid regions, giving up\n", node->full_name); | 332 | pr_err("%pOF: no valid regions, giving up\n", node); |
333 | err = -ENOMEM; | 333 | err = -ENOMEM; |
334 | goto out_free; | 334 | goto out_free; |
335 | } | 335 | } |
336 | 336 | ||
337 | WARN(num_ictlrs != soc->num_ictlrs, | 337 | WARN(num_ictlrs != soc->num_ictlrs, |
338 | "%s: Found %u interrupt controllers in DT; expected %u.\n", | 338 | "%pOF: Found %u interrupt controllers in DT; expected %u.\n", |
339 | node->full_name, num_ictlrs, soc->num_ictlrs); | 339 | node, num_ictlrs, soc->num_ictlrs); |
340 | 340 | ||
341 | 341 | ||
342 | domain = irq_domain_add_hierarchy(parent_domain, 0, num_ictlrs * 32, | 342 | domain = irq_domain_add_hierarchy(parent_domain, 0, num_ictlrs * 32, |
343 | node, &tegra_ictlr_domain_ops, | 343 | node, &tegra_ictlr_domain_ops, |
344 | lic); | 344 | lic); |
345 | if (!domain) { | 345 | if (!domain) { |
346 | pr_err("%s: failed to allocated domain\n", node->full_name); | 346 | pr_err("%pOF: failed to allocated domain\n", node); |
347 | err = -ENOMEM; | 347 | err = -ENOMEM; |
348 | goto out_unmap; | 348 | goto out_unmap; |
349 | } | 349 | } |
350 | 350 | ||
351 | tegra_ictlr_syscore_init(); | 351 | tegra_ictlr_syscore_init(); |
352 | 352 | ||
353 | pr_info("%s: %d interrupts forwarded to %s\n", | 353 | pr_info("%pOF: %d interrupts forwarded to %pOF\n", |
354 | node->full_name, num_ictlrs * 32, parent->full_name); | 354 | node, num_ictlrs * 32, parent); |
355 | 355 | ||
356 | return 0; | 356 | return 0; |
357 | 357 | ||
diff --git a/drivers/irqchip/irq-xilinx-intc.c b/drivers/irqchip/irq-xilinx-intc.c index 3db7ab1c9741..e3043ded8973 100644 --- a/drivers/irqchip/irq-xilinx-intc.c +++ b/drivers/irqchip/irq-xilinx-intc.c | |||
@@ -186,8 +186,8 @@ static int __init xilinx_intc_of_init(struct device_node *intc, | |||
186 | if (irqc->intr_mask >> nr_irq) | 186 | if (irqc->intr_mask >> nr_irq) |
187 | pr_warn("irq-xilinx: mismatch in kind-of-intr param\n"); | 187 | pr_warn("irq-xilinx: mismatch in kind-of-intr param\n"); |
188 | 188 | ||
189 | pr_info("irq-xilinx: %s: num_irq=%d, edge=0x%x\n", | 189 | pr_info("irq-xilinx: %pOF: num_irq=%d, edge=0x%x\n", |
190 | intc->full_name, nr_irq, irqc->intr_mask); | 190 | intc, nr_irq, irqc->intr_mask); |
191 | 191 | ||
192 | 192 | ||
193 | /* | 193 | /* |