summaryrefslogtreecommitdiffstats
path: root/drivers/irqchip
diff options
context:
space:
mode:
authorRob Herring <robh@kernel.org>2018-08-27 20:56:15 -0400
committerRob Herring <robh@kernel.org>2018-11-27 11:54:17 -0500
commit2ef790dc443a25cc3818b0fa34cb9f4ed0ec5ec1 (patch)
treebadd52c6b636f363cb3fc53f7d052b29a1d9cc5f /drivers/irqchip
parent229c55ccb487c0c10721fdb92af874d7b8671cda (diff)
irqchip: Convert to using %pOFn instead of device_node.name
In preparation to remove the node name pointer from struct device_node, convert printf users to use the %pOFn format specifier. Acked-by: Thomas Gleixner <tglx@linutronix.de> Cc: Jason Cooper <jason@lakedaemon.net> Cc: Marc Zyngier <marc.zyngier@arm.com> Cc: linux-arm-kernel@lists.infradead.org Signed-off-by: Rob Herring <robh@kernel.org>
Diffstat (limited to 'drivers/irqchip')
-rw-r--r--drivers/irqchip/irq-gic-v3.c4
-rw-r--r--drivers/irqchip/irq-mscc-ocelot.c6
-rw-r--r--drivers/irqchip/irq-orion.c22
-rw-r--r--drivers/irqchip/irq-stm32-exti.c6
-rw-r--r--drivers/irqchip/irq-tango.c10
-rw-r--r--drivers/irqchip/irq-tb10x.c18
6 files changed, 33 insertions, 33 deletions
diff --git a/drivers/irqchip/irq-gic-v3.c b/drivers/irqchip/irq-gic-v3.c
index 8f87f40c9460..29e9d47be97d 100644
--- a/drivers/irqchip/irq-gic-v3.c
+++ b/drivers/irqchip/irq-gic-v3.c
@@ -1184,8 +1184,8 @@ static void __init gic_populate_ppi_partitions(struct device_node *gic_node)
1184 1184
1185 part->partition_id = of_node_to_fwnode(child_part); 1185 part->partition_id = of_node_to_fwnode(child_part);
1186 1186
1187 pr_info("GIC: PPI partition %s[%d] { ", 1187 pr_info("GIC: PPI partition %pOFn[%d] { ",
1188 child_part->name, part_idx); 1188 child_part, part_idx);
1189 1189
1190 n = of_property_count_elems_of_size(child_part, "affinity", 1190 n = of_property_count_elems_of_size(child_part, "affinity",
1191 sizeof(u32)); 1191 sizeof(u32));
diff --git a/drivers/irqchip/irq-mscc-ocelot.c b/drivers/irqchip/irq-mscc-ocelot.c
index b63e40c00a02..88143c0b700c 100644
--- a/drivers/irqchip/irq-mscc-ocelot.c
+++ b/drivers/irqchip/irq-mscc-ocelot.c
@@ -72,7 +72,7 @@ static int __init ocelot_irq_init(struct device_node *node,
72 domain = irq_domain_add_linear(node, OCELOT_NR_IRQ, 72 domain = irq_domain_add_linear(node, OCELOT_NR_IRQ,
73 &irq_generic_chip_ops, NULL); 73 &irq_generic_chip_ops, NULL);
74 if (!domain) { 74 if (!domain) {
75 pr_err("%s: unable to add irq domain\n", node->name); 75 pr_err("%pOFn: unable to add irq domain\n", node);
76 return -ENOMEM; 76 return -ENOMEM;
77 } 77 }
78 78
@@ -80,14 +80,14 @@ static int __init ocelot_irq_init(struct device_node *node,
80 "icpu", handle_level_irq, 80 "icpu", handle_level_irq,
81 0, 0, 0); 81 0, 0, 0);
82 if (ret) { 82 if (ret) {
83 pr_err("%s: unable to alloc irq domain gc\n", node->name); 83 pr_err("%pOFn: unable to alloc irq domain gc\n", node);
84 goto err_domain_remove; 84 goto err_domain_remove;
85 } 85 }
86 86
87 gc = irq_get_domain_generic_chip(domain, 0); 87 gc = irq_get_domain_generic_chip(domain, 0);
88 gc->reg_base = of_iomap(node, 0); 88 gc->reg_base = of_iomap(node, 0);
89 if (!gc->reg_base) { 89 if (!gc->reg_base) {
90 pr_err("%s: unable to map resource\n", node->name); 90 pr_err("%pOFn: unable to map resource\n", node);
91 ret = -ENOMEM; 91 ret = -ENOMEM;
92 goto err_gc_free; 92 goto err_gc_free;
93 } 93 }
diff --git a/drivers/irqchip/irq-orion.c b/drivers/irqchip/irq-orion.c
index be4c5a8c9659..c4b5ffb61954 100644
--- a/drivers/irqchip/irq-orion.c
+++ b/drivers/irqchip/irq-orion.c
@@ -64,14 +64,14 @@ static int __init orion_irq_init(struct device_node *np,
64 num_chips * ORION_IRQS_PER_CHIP, 64 num_chips * ORION_IRQS_PER_CHIP,
65 &irq_generic_chip_ops, NULL); 65 &irq_generic_chip_ops, NULL);
66 if (!orion_irq_domain) 66 if (!orion_irq_domain)
67 panic("%s: unable to add irq domain\n", np->name); 67 panic("%pOFn: unable to add irq domain\n", np);
68 68
69 ret = irq_alloc_domain_generic_chips(orion_irq_domain, 69 ret = irq_alloc_domain_generic_chips(orion_irq_domain,
70 ORION_IRQS_PER_CHIP, 1, np->name, 70 ORION_IRQS_PER_CHIP, 1, np->full_name,
71 handle_level_irq, clr, 0, 71 handle_level_irq, clr, 0,
72 IRQ_GC_INIT_MASK_CACHE); 72 IRQ_GC_INIT_MASK_CACHE);
73 if (ret) 73 if (ret)
74 panic("%s: unable to alloc irq domain gc\n", np->name); 74 panic("%pOFn: unable to alloc irq domain gc\n", np);
75 75
76 for (n = 0, base = 0; n < num_chips; n++, base += ORION_IRQS_PER_CHIP) { 76 for (n = 0, base = 0; n < num_chips; n++, base += ORION_IRQS_PER_CHIP) {
77 struct irq_chip_generic *gc = 77 struct irq_chip_generic *gc =
@@ -80,12 +80,12 @@ static int __init orion_irq_init(struct device_node *np,
80 of_address_to_resource(np, n, &r); 80 of_address_to_resource(np, n, &r);
81 81
82 if (!request_mem_region(r.start, resource_size(&r), np->name)) 82 if (!request_mem_region(r.start, resource_size(&r), np->name))
83 panic("%s: unable to request mem region %d", 83 panic("%pOFn: unable to request mem region %d",
84 np->name, n); 84 np, n);
85 85
86 gc->reg_base = ioremap(r.start, resource_size(&r)); 86 gc->reg_base = ioremap(r.start, resource_size(&r));
87 if (!gc->reg_base) 87 if (!gc->reg_base)
88 panic("%s: unable to map resource %d", np->name, n); 88 panic("%pOFn: unable to map resource %d", np, n);
89 89
90 gc->chip_types[0].regs.mask = ORION_IRQ_MASK; 90 gc->chip_types[0].regs.mask = ORION_IRQ_MASK;
91 gc->chip_types[0].chip.irq_mask = irq_gc_mask_clr_bit; 91 gc->chip_types[0].chip.irq_mask = irq_gc_mask_clr_bit;
@@ -150,20 +150,20 @@ static int __init orion_bridge_irq_init(struct device_node *np,
150 domain = irq_domain_add_linear(np, nrirqs, 150 domain = irq_domain_add_linear(np, nrirqs,
151 &irq_generic_chip_ops, NULL); 151 &irq_generic_chip_ops, NULL);
152 if (!domain) { 152 if (!domain) {
153 pr_err("%s: unable to add irq domain\n", np->name); 153 pr_err("%pOFn: unable to add irq domain\n", np);
154 return -ENOMEM; 154 return -ENOMEM;
155 } 155 }
156 156
157 ret = irq_alloc_domain_generic_chips(domain, nrirqs, 1, np->name, 157 ret = irq_alloc_domain_generic_chips(domain, nrirqs, 1, np->name,
158 handle_edge_irq, clr, 0, IRQ_GC_INIT_MASK_CACHE); 158 handle_edge_irq, clr, 0, IRQ_GC_INIT_MASK_CACHE);
159 if (ret) { 159 if (ret) {
160 pr_err("%s: unable to alloc irq domain gc\n", np->name); 160 pr_err("%pOFn: unable to alloc irq domain gc\n", np);
161 return ret; 161 return ret;
162 } 162 }
163 163
164 ret = of_address_to_resource(np, 0, &r); 164 ret = of_address_to_resource(np, 0, &r);
165 if (ret) { 165 if (ret) {
166 pr_err("%s: unable to get resource\n", np->name); 166 pr_err("%pOFn: unable to get resource\n", np);
167 return ret; 167 return ret;
168 } 168 }
169 169
@@ -175,14 +175,14 @@ static int __init orion_bridge_irq_init(struct device_node *np,
175 /* Map the parent interrupt for the chained handler */ 175 /* Map the parent interrupt for the chained handler */
176 irq = irq_of_parse_and_map(np, 0); 176 irq = irq_of_parse_and_map(np, 0);
177 if (irq <= 0) { 177 if (irq <= 0) {
178 pr_err("%s: unable to parse irq\n", np->name); 178 pr_err("%pOFn: unable to parse irq\n", np);
179 return -EINVAL; 179 return -EINVAL;
180 } 180 }
181 181
182 gc = irq_get_domain_generic_chip(domain, 0); 182 gc = irq_get_domain_generic_chip(domain, 0);
183 gc->reg_base = ioremap(r.start, resource_size(&r)); 183 gc->reg_base = ioremap(r.start, resource_size(&r));
184 if (!gc->reg_base) { 184 if (!gc->reg_base) {
185 pr_err("%s: unable to map resource\n", np->name); 185 pr_err("%pOFn: unable to map resource\n", np);
186 return -ENOMEM; 186 return -ENOMEM;
187 } 187 }
188 188
diff --git a/drivers/irqchip/irq-stm32-exti.c b/drivers/irqchip/irq-stm32-exti.c
index 0a2088e12d96..363385750fa7 100644
--- a/drivers/irqchip/irq-stm32-exti.c
+++ b/drivers/irqchip/irq-stm32-exti.c
@@ -678,8 +678,8 @@ static int __init stm32_exti_init(const struct stm32_exti_drv_data *drv_data,
678 domain = irq_domain_add_linear(node, drv_data->bank_nr * IRQS_PER_BANK, 678 domain = irq_domain_add_linear(node, drv_data->bank_nr * IRQS_PER_BANK,
679 &irq_exti_domain_ops, NULL); 679 &irq_exti_domain_ops, NULL);
680 if (!domain) { 680 if (!domain) {
681 pr_err("%s: Could not register interrupt domain.\n", 681 pr_err("%pOFn: Could not register interrupt domain.\n",
682 node->name); 682 node);
683 ret = -ENOMEM; 683 ret = -ENOMEM;
684 goto out_unmap; 684 goto out_unmap;
685 } 685 }
@@ -768,7 +768,7 @@ __init stm32_exti_hierarchy_init(const struct stm32_exti_drv_data *drv_data,
768 host_data); 768 host_data);
769 769
770 if (!domain) { 770 if (!domain) {
771 pr_err("%s: Could not register exti domain.\n", node->name); 771 pr_err("%pOFn: Could not register exti domain.\n", node);
772 ret = -ENOMEM; 772 ret = -ENOMEM;
773 goto out_unmap; 773 goto out_unmap;
774 } 774 }
diff --git a/drivers/irqchip/irq-tango.c b/drivers/irqchip/irq-tango.c
index 580e2d72b9ba..ae28d8648679 100644
--- a/drivers/irqchip/irq-tango.c
+++ b/drivers/irqchip/irq-tango.c
@@ -184,11 +184,11 @@ static int __init tangox_irq_init(void __iomem *base, struct resource *baseres,
184 184
185 irq = irq_of_parse_and_map(node, 0); 185 irq = irq_of_parse_and_map(node, 0);
186 if (!irq) 186 if (!irq)
187 panic("%s: failed to get IRQ", node->name); 187 panic("%pOFn: failed to get IRQ", node);
188 188
189 err = of_address_to_resource(node, 0, &res); 189 err = of_address_to_resource(node, 0, &res);
190 if (err) 190 if (err)
191 panic("%s: failed to get address", node->name); 191 panic("%pOFn: failed to get address", node);
192 192
193 chip = kzalloc(sizeof(*chip), GFP_KERNEL); 193 chip = kzalloc(sizeof(*chip), GFP_KERNEL);
194 chip->ctl = res.start - baseres->start; 194 chip->ctl = res.start - baseres->start;
@@ -196,12 +196,12 @@ static int __init tangox_irq_init(void __iomem *base, struct resource *baseres,
196 196
197 dom = irq_domain_add_linear(node, 64, &irq_generic_chip_ops, chip); 197 dom = irq_domain_add_linear(node, 64, &irq_generic_chip_ops, chip);
198 if (!dom) 198 if (!dom)
199 panic("%s: failed to create irqdomain", node->name); 199 panic("%pOFn: failed to create irqdomain", node);
200 200
201 err = irq_alloc_domain_generic_chips(dom, 32, 2, node->name, 201 err = irq_alloc_domain_generic_chips(dom, 32, 2, node->name,
202 handle_level_irq, 0, 0, 0); 202 handle_level_irq, 0, 0, 0);
203 if (err) 203 if (err)
204 panic("%s: failed to allocate irqchip", node->name); 204 panic("%pOFn: failed to allocate irqchip", node);
205 205
206 tangox_irq_domain_init(dom); 206 tangox_irq_domain_init(dom);
207 207
@@ -219,7 +219,7 @@ static int __init tangox_of_irq_init(struct device_node *node,
219 219
220 base = of_iomap(node, 0); 220 base = of_iomap(node, 0);
221 if (!base) 221 if (!base)
222 panic("%s: of_iomap failed", node->name); 222 panic("%pOFn: of_iomap failed", node);
223 223
224 of_address_to_resource(node, 0, &res); 224 of_address_to_resource(node, 0, &res);
225 225
diff --git a/drivers/irqchip/irq-tb10x.c b/drivers/irqchip/irq-tb10x.c
index 848d782a2a3b..7e6708099a7b 100644
--- a/drivers/irqchip/irq-tb10x.c
+++ b/drivers/irqchip/irq-tb10x.c
@@ -115,21 +115,21 @@ static int __init of_tb10x_init_irq(struct device_node *ictl,
115 void __iomem *reg_base; 115 void __iomem *reg_base;
116 116
117 if (of_address_to_resource(ictl, 0, &mem)) { 117 if (of_address_to_resource(ictl, 0, &mem)) {
118 pr_err("%s: No registers declared in DeviceTree.\n", 118 pr_err("%pOFn: No registers declared in DeviceTree.\n",
119 ictl->name); 119 ictl);
120 return -EINVAL; 120 return -EINVAL;
121 } 121 }
122 122
123 if (!request_mem_region(mem.start, resource_size(&mem), 123 if (!request_mem_region(mem.start, resource_size(&mem),
124 ictl->name)) { 124 ictl->full_name)) {
125 pr_err("%s: Request mem region failed.\n", ictl->name); 125 pr_err("%pOFn: Request mem region failed.\n", ictl);
126 return -EBUSY; 126 return -EBUSY;
127 } 127 }
128 128
129 reg_base = ioremap(mem.start, resource_size(&mem)); 129 reg_base = ioremap(mem.start, resource_size(&mem));
130 if (!reg_base) { 130 if (!reg_base) {
131 ret = -EBUSY; 131 ret = -EBUSY;
132 pr_err("%s: ioremap failed.\n", ictl->name); 132 pr_err("%pOFn: ioremap failed.\n", ictl);
133 goto ioremap_fail; 133 goto ioremap_fail;
134 } 134 }
135 135
@@ -137,8 +137,8 @@ static int __init of_tb10x_init_irq(struct device_node *ictl,
137 &irq_generic_chip_ops, NULL); 137 &irq_generic_chip_ops, NULL);
138 if (!domain) { 138 if (!domain) {
139 ret = -ENOMEM; 139 ret = -ENOMEM;
140 pr_err("%s: Could not register interrupt domain.\n", 140 pr_err("%pOFn: Could not register interrupt domain.\n",
141 ictl->name); 141 ictl);
142 goto irq_domain_add_fail; 142 goto irq_domain_add_fail;
143 } 143 }
144 144
@@ -147,8 +147,8 @@ static int __init of_tb10x_init_irq(struct device_node *ictl,
147 IRQ_NOREQUEST, IRQ_NOPROBE, 147 IRQ_NOREQUEST, IRQ_NOPROBE,
148 IRQ_GC_INIT_MASK_CACHE); 148 IRQ_GC_INIT_MASK_CACHE);
149 if (ret) { 149 if (ret) {
150 pr_err("%s: Could not allocate generic interrupt chip.\n", 150 pr_err("%pOFn: Could not allocate generic interrupt chip.\n",
151 ictl->name); 151 ictl);
152 goto gc_alloc_fail; 152 goto gc_alloc_fail;
153 } 153 }
154 154