The device tree node name is typically "interrupt-controller", which is
rather useless when used in printk messages and irq chip names for
identification purposes. Use the driver name "sunxi-nmi" instead.
Signed-off-by: Chen-Yu Tsai <w...@csie.org>
---
drivers/irqchip/irq-sunxi-nmi.c | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
diff --git a/drivers/irqchip/irq-sunxi-nmi.c b/drivers/irqchip/irq-sunxi-nmi.c
index c143dd58410c..57e009917d2d 100644
--- a/drivers/irqchip/irq-sunxi-nmi.c
+++ b/drivers/irqchip/irq-sunxi-nmi.c
@@ -21,6 +21,7 @@
#include <linux/irqchip/chained_irq.h>
#define SUNXI_NMI_SRC_TYPE_MASK 0x00000003
+#define DRV_NAME "sunxi-nmi"
enum {
SUNXI_SRC_TYPE_LEVEL_LOW = 0,
@@ -130,22 +131,22 @@ static int __init sunxi_sc_nmi_irq_init(struct
device_node *node,
domain = irq_domain_add_linear(node, 1, &irq_generic_chip_ops, NULL);
if (!domain) {
- pr_err("%s: Could not register interrupt domain.\n",
node->name);
+ pr_err("%s: Could not register interrupt domain.\n", DRV_NAME);
return -ENOMEM;
}
- ret = irq_alloc_domain_generic_chips(domain, 1, 2, node->name,
+ ret = irq_alloc_domain_generic_chips(domain, 1, 2, DRV_NAME,
handle_fasteoi_irq, clr, 0,
IRQ_GC_INIT_MASK_CACHE);
if (ret) {
pr_err("%s: Could not allocate generic interrupt chip.\n",
- node->name);
+ DRV_NAME);
goto fail_irqd_remove;
}
irq = irq_of_parse_and_map(node, 0);
if (irq <= 0) {
- pr_err("%s: unable to parse irq\n", node->name);
+ pr_err("%s: unable to parse irq\n", DRV_NAME);
ret = -EINVAL;
goto fail_irqd_remove;
}
@@ -153,7 +154,7 @@ static int __init sunxi_sc_nmi_irq_init(struct device_node
*node,
gc = irq_get_domain_generic_chip(domain, 0);
gc->reg_base = of_iomap(node, 0);
if (!gc->reg_base) {
- pr_err("%s: unable to map resource\n", node->name);
+ pr_err("%s: unable to map resource\n", DRV_NAME);
ret = -ENOMEM;
goto fail_irqd_remove;
}
--
2.5.3
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
