mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-08-20 14:16:02 +00:00
Code Issues Releases Wiki Activity

irqchip/sunxi-nmi: Use driver name instead of DT node name for identification

Browse source 
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.

While at it move the identifier from pr_err() calls to the pr_fmt macro.

Also remove the "__func__" identifier from the error message in the
interrupt type setting callback, sunxi_sc_nmi_set_type(). The driver
name in the pr_fmt macro should be enough.

Signed-off-by: Chen-Yu Tsai <wens@csie.org>
Cc: linux-arm-kernel@lists.infradead.org
Cc: Jason Cooper <jason@lakedaemon.net>
Cc: Marc Zyngier <marc.zyngier@arm.com>
Cc: Maxime Ripard <maxime.ripard@free-electrons.com>
Link: http://lkml.kernel.org/r/1444063334-19832-2-git-send-email-wens@csie.org
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
This commit is contained in:
Chen-Yu Tsai 2015-10-06 00:42:13 +08:00 committed by Thomas Gleixner
parent fcf1ae2f7a
commit 2d6caaed09
1 changed files with 11 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
drivers/irqchip/irq-sunxi-nmi.c
View file

@ -8,6 +8,9 @@
* warranty of any kind, whether express or implied. * warranty of any kind, whether express or implied.
*/ */
#define DRV_NAME "sunxi-nmi"
#define pr_fmt(fmt) DRV_NAME ": " fmt
#include <linux/bitops.h> #include <linux/bitops.h>
#include <linux/device.h> #include <linux/device.h>
#include <linux/io.h> #include <linux/io.h>
@ -96,8 +99,8 @@ static int sunxi_sc_nmi_set_type(struct irq_data *data, unsigned int flow_type)
break; break;
default: default:
irq_gc_unlock(gc); irq_gc_unlock(gc);
pr_err("%s: Cannot assign multiple trigger modes to IRQ %d.\n", pr_err("Cannot assign multiple trigger modes to IRQ %d.\n",
__func__, data->irq); data->irq);
return -EBADR; return -EBADR;
} }
@ -130,22 +133,21 @@ static int __init sunxi_sc_nmi_irq_init(struct device_node *node,
domain = irq_domain_add_linear(node, 1, &irq_generic_chip_ops, NULL); domain = irq_domain_add_linear(node, 1, &irq_generic_chip_ops, NULL);
if (!domain) { if (!domain) {
pr_err("%s: Could not register interrupt domain.\n", node->name); pr_err("Could not register interrupt domain.\n");
return -ENOMEM; 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, handle_fasteoi_irq, clr, 0,
IRQ_GC_INIT_MASK_CACHE); IRQ_GC_INIT_MASK_CACHE);
if (ret) { if (ret) {
pr_err("%s: Could not allocate generic interrupt chip.\n", pr_err("Could not allocate generic interrupt chip.\n");
node->name); goto fail_irqd_remove;
goto fail_irqd_remove;
} }
irq = irq_of_parse_and_map(node, 0); irq = irq_of_parse_and_map(node, 0);
if (irq <= 0) { if (irq <= 0) {
pr_err("%s: unable to parse irq\n", node->name); pr_err("unable to parse irq\n");
ret = -EINVAL; ret = -EINVAL;
goto fail_irqd_remove; goto fail_irqd_remove;
} }
@ -153,7 +155,7 @@ static int __init sunxi_sc_nmi_irq_init(struct device_node *node,
gc = irq_get_domain_generic_chip(domain, 0); gc = irq_get_domain_generic_chip(domain, 0);
gc->reg_base = of_iomap(node, 0); gc->reg_base = of_iomap(node, 0);
if (!gc->reg_base) { if (!gc->reg_base) {
pr_err("%s: unable to map resource\n", node->name); pr_err("unable to map resource\n");
ret = -ENOMEM; ret = -ENOMEM;
goto fail_irqd_remove; goto fail_irqd_remove;
} }