aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZubair Lutfullah Kakakhel <Zubair.Kakakhel@imgtec.com>2016-11-14 07:13:46 -0500
committerMarc Zyngier <marc.zyngier@arm.com>2016-11-29 04:14:49 -0500
commita5734de263e70c75e61778be038add78441610e3 (patch)
treeca3543af9132182732f569e761946bf4a38cd778
parent0547dc7885856c93b0c8bbf1f590ceccf0c87835 (diff)
irqchip/xilinx: Clean up print messages
Remove __func__ and prefix irq-xilinx in various debug prints Acked-by: Michal Simek <michal.simek@xilinx.com> Signed-off-by: Zubair Lutfullah Kakakhel <Zubair.Kakakhel@imgtec.com> Signed-off-by: Marc Zyngier <marc.zyngier@arm.com>
-rw-r--r--drivers/irqchip/irq-xilinx-intc.c18
1 files changed, 9 insertions, 9 deletions
diff --git a/drivers/irqchip/irq-xilinx-intc.c b/drivers/irqchip/irq-xilinx-intc.c
index 90bec7d71f85..096c1ed51d5a 100644
--- a/drivers/irqchip/irq-xilinx-intc.c
+++ b/drivers/irqchip/irq-xilinx-intc.c
@@ -58,7 +58,7 @@ static void intc_enable_or_unmask(struct irq_data *d)
58{ 58{
59 unsigned long mask = 1 << d->hwirq; 59 unsigned long mask = 1 << d->hwirq;
60 60
61 pr_debug("enable_or_unmask: %ld\n", d->hwirq); 61 pr_debug("irq-xilinx: enable_or_unmask: %ld\n", d->hwirq);
62 62
63 /* ack level irqs because they can't be acked during 63 /* ack level irqs because they can't be acked during
64 * ack function since the handle_level_irq function 64 * ack function since the handle_level_irq function
@@ -72,13 +72,13 @@ static void intc_enable_or_unmask(struct irq_data *d)
72 72
73static void intc_disable_or_mask(struct irq_data *d) 73static void intc_disable_or_mask(struct irq_data *d)
74{ 74{
75 pr_debug("disable: %ld\n", d->hwirq); 75 pr_debug("irq-xilinx: disable: %ld\n", d->hwirq);
76 write_fn(1 << d->hwirq, intc_baseaddr + CIE); 76 write_fn(1 << d->hwirq, intc_baseaddr + CIE);
77} 77}
78 78
79static void intc_ack(struct irq_data *d) 79static void intc_ack(struct irq_data *d)
80{ 80{
81 pr_debug("ack: %ld\n", d->hwirq); 81 pr_debug("irq-xilinx: ack: %ld\n", d->hwirq);
82 write_fn(1 << d->hwirq, intc_baseaddr + IAR); 82 write_fn(1 << d->hwirq, intc_baseaddr + IAR);
83} 83}
84 84
@@ -86,7 +86,7 @@ static void intc_mask_ack(struct irq_data *d)
86{ 86{
87 unsigned long mask = 1 << d->hwirq; 87 unsigned long mask = 1 << d->hwirq;
88 88
89 pr_debug("disable_and_ack: %ld\n", d->hwirq); 89 pr_debug("irq-xilinx: disable_and_ack: %ld\n", d->hwirq);
90 write_fn(mask, intc_baseaddr + CIE); 90 write_fn(mask, intc_baseaddr + CIE);
91 write_fn(mask, intc_baseaddr + IAR); 91 write_fn(mask, intc_baseaddr + IAR);
92} 92}
@@ -109,7 +109,7 @@ unsigned int get_irq(void)
109 if (hwirq != -1U) 109 if (hwirq != -1U)
110 irq = irq_find_mapping(root_domain, hwirq); 110 irq = irq_find_mapping(root_domain, hwirq);
111 111
112 pr_debug("get_irq: hwirq=%d, irq=%d\n", hwirq, irq); 112 pr_debug("irq-xilinx: hwirq=%d, irq=%d\n", hwirq, irq);
113 113
114 return irq; 114 return irq;
115} 115}
@@ -146,20 +146,20 @@ static int __init xilinx_intc_of_init(struct device_node *intc,
146 146
147 ret = of_property_read_u32(intc, "xlnx,num-intr-inputs", &nr_irq); 147 ret = of_property_read_u32(intc, "xlnx,num-intr-inputs", &nr_irq);
148 if (ret < 0) { 148 if (ret < 0) {
149 pr_err("%s: unable to read xlnx,num-intr-inputs\n", __func__); 149 pr_err("irq-xilinx: unable to read xlnx,num-intr-inputs\n");
150 return ret; 150 return ret;
151 } 151 }
152 152
153 ret = of_property_read_u32(intc, "xlnx,kind-of-intr", &intr_mask); 153 ret = of_property_read_u32(intc, "xlnx,kind-of-intr", &intr_mask);
154 if (ret < 0) { 154 if (ret < 0) {
155 pr_err("%s: unable to read xlnx,kind-of-intr\n", __func__); 155 pr_err("irq-xilinx: unable to read xlnx,kind-of-intr\n");
156 return ret; 156 return ret;
157 } 157 }
158 158
159 if (intr_mask >> nr_irq) 159 if (intr_mask >> nr_irq)
160 pr_warn("%s: mismatch in kind-of-intr param\n", __func__); 160 pr_warn("irq-xilinx: mismatch in kind-of-intr param\n");
161 161
162 pr_info("%s: num_irq=%d, edge=0x%x\n", 162 pr_info("irq-xilinx: %s: num_irq=%d, edge=0x%x\n",
163 intc->full_name, nr_irq, intr_mask); 163 intc->full_name, nr_irq, intr_mask);
164 164
165 write_fn = intc_write32; 165 write_fn = intc_write32;