浏览代码

irqchip/mips-gic: Add pr_fmt and reword pr_* messages

Several messages from the MIPS GIC driver include the text "GIC", but
the format is not standard. Add a pr_fmt of "irq-mips-gic: " and reword
the messages now that they will be prefixed with the driver name.

Signed-off-by: Matt Redfearn <matt.redfearn@mips.com>
Reviewed-by: Paul Burton <paul.burton@mips.com>
Signed-off-by: Marc Zyngier <marc.zyngier@arm.com>
Matt Redfearn 7 年之前
父节点
当前提交
1f19aee0ec
共有 1 个文件被更改,包括 7 次插入4 次删除
  1. 7 4
      drivers/irqchip/irq-mips-gic.c

+ 7 - 4
drivers/irqchip/irq-mips-gic.c

@@ -6,6 +6,9 @@
  * Copyright (C) 2008 Ralf Baechle (ralf@linux-mips.org)
  * Copyright (C) 2008 Ralf Baechle (ralf@linux-mips.org)
  * Copyright (C) 2012 MIPS Technologies, Inc.  All rights reserved.
  * Copyright (C) 2012 MIPS Technologies, Inc.  All rights reserved.
  */
  */
+
+#define pr_fmt(fmt) "irq-mips-gic: " fmt
+
 #include <linux/bitmap.h>
 #include <linux/bitmap.h>
 #include <linux/clocksource.h>
 #include <linux/clocksource.h>
 #include <linux/cpuhotplug.h>
 #include <linux/cpuhotplug.h>
@@ -685,7 +688,7 @@ static int __init gic_of_init(struct device_node *node,
 
 
 	cpu_vec = find_first_zero_bit(&reserved, hweight_long(ST0_IM));
 	cpu_vec = find_first_zero_bit(&reserved, hweight_long(ST0_IM));
 	if (cpu_vec == hweight_long(ST0_IM)) {
 	if (cpu_vec == hweight_long(ST0_IM)) {
-		pr_err("No CPU vectors available for GIC\n");
+		pr_err("No CPU vectors available\n");
 		return -ENODEV;
 		return -ENODEV;
 	}
 	}
 
 
@@ -699,7 +702,7 @@ static int __init gic_of_init(struct device_node *node,
 				~CM_GCR_GIC_BASE_GICEN;
 				~CM_GCR_GIC_BASE_GICEN;
 			gic_len = 0x20000;
 			gic_len = 0x20000;
 		} else {
 		} else {
-			pr_err("Failed to get GIC memory range\n");
+			pr_err("Failed to get memory range\n");
 			return -ENODEV;
 			return -ENODEV;
 		}
 		}
 	} else {
 	} else {
@@ -757,7 +760,7 @@ static int __init gic_of_init(struct device_node *node,
 					       gic_shared_intrs, 0,
 					       gic_shared_intrs, 0,
 					       &gic_irq_domain_ops, NULL);
 					       &gic_irq_domain_ops, NULL);
 	if (!gic_irq_domain) {
 	if (!gic_irq_domain) {
-		pr_err("Failed to add GIC IRQ domain");
+		pr_err("Failed to add IRQ domain");
 		return -ENXIO;
 		return -ENXIO;
 	}
 	}
 
 
@@ -766,7 +769,7 @@ static int __init gic_of_init(struct device_node *node,
 						  GIC_NUM_LOCAL_INTRS + gic_shared_intrs,
 						  GIC_NUM_LOCAL_INTRS + gic_shared_intrs,
 						  node, &gic_ipi_domain_ops, NULL);
 						  node, &gic_ipi_domain_ops, NULL);
 	if (!gic_ipi_domain) {
 	if (!gic_ipi_domain) {
-		pr_err("Failed to add GIC IPI domain");
+		pr_err("Failed to add IPI domain");
 		return -ENXIO;
 		return -ENXIO;
 	}
 	}