aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGuenter Roeck <linux@roeck-us.net>2015-12-15 23:30:37 -0500
committerYoshinori Sato <ysato@users.sourceforge.jp>2016-01-20 08:44:13 -0500
commitbe13326058e79c0b3d8caea5e7d1b34286c09487 (patch)
treeb1c3bb28cb810d4d4a7e80d0fe3ddf9a3120ed2f
parent9ee05bb627c08eae8b854c9fa1d77e75188954b6 (diff)
irqchip: renesas-h8s: Replace ctrl_outw/ctrl_inw with writew/readw
Commit 13ae42a3b1c1 ("h8300: Rename ctlr_out/in[bwl] to raw_read/write[bwl]") changed the function names, but not all callers, resulting in drivers/irqchip/irq-renesas-h8s.c: In function ‘h8s_disable_irq’: drivers/irqchip/irq-renesas-h8s.c:43:9: error: implicit declaration of function ‘ctrl_inw’ drivers/irqchip/irq-renesas-h8s.c:44:2: error: implicit declaration of function ‘ctrl_outw’ Fixes: 13ae42a3b1c1 ("h8300: Rename ctlr_out/in[bwl] to raw_read/write[bwl]") Cc: Daniel Lezcano <daniel.lezcano@linaro.org> Signed-off-by: Guenter Roeck <linux@roeck-us.net>
-rw-r--r--drivers/irqchip/irq-renesas-h8s.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/irqchip/irq-renesas-h8s.c b/drivers/irqchip/irq-renesas-h8s.c
index 8098ead1eb22..af8c6c61c824 100644
--- a/drivers/irqchip/irq-renesas-h8s.c
+++ b/drivers/irqchip/irq-renesas-h8s.c
@@ -40,8 +40,8 @@ static void h8s_disable_irq(struct irq_data *data)
40 addr = IPRA + ((ipr_table[irq - 16] & 0xf0) >> 3); 40 addr = IPRA + ((ipr_table[irq - 16] & 0xf0) >> 3);
41 pos = (ipr_table[irq - 16] & 0x0f) * 4; 41 pos = (ipr_table[irq - 16] & 0x0f) * 4;
42 pri = ~(0x000f << pos); 42 pri = ~(0x000f << pos);
43 pri &= ctrl_inw(addr); 43 pri &= readw(addr);
44 ctrl_outw(pri, addr); 44 writew(pri, addr);
45} 45}
46 46
47static void h8s_enable_irq(struct irq_data *data) 47static void h8s_enable_irq(struct irq_data *data)
@@ -54,9 +54,9 @@ static void h8s_enable_irq(struct irq_data *data)
54 addr = IPRA + ((ipr_table[irq - 16] & 0xf0) >> 3); 54 addr = IPRA + ((ipr_table[irq - 16] & 0xf0) >> 3);
55 pos = (ipr_table[irq - 16] & 0x0f) * 4; 55 pos = (ipr_table[irq - 16] & 0x0f) * 4;
56 pri = ~(0x000f << pos); 56 pri = ~(0x000f << pos);
57 pri &= ctrl_inw(addr); 57 pri &= readw(addr);
58 pri |= 1 << pos; 58 pri |= 1 << pos;
59 ctrl_outw(pri, addr); 59 writew(pri, addr);
60} 60}
61 61
62struct irq_chip h8s_irq_chip = { 62struct irq_chip h8s_irq_chip = {
@@ -90,7 +90,7 @@ static int __init h8s_intc_of_init(struct device_node *intc,
90 /* All interrupt priority is 0 (disable) */ 90 /* All interrupt priority is 0 (disable) */
91 /* IPRA to IPRK */ 91 /* IPRA to IPRK */
92 for (n = 0; n <= 'k' - 'a'; n++) 92 for (n = 0; n <= 'k' - 'a'; n++)
93 ctrl_outw(0x0000, IPRA + (n * 2)); 93 writew(0x0000, IPRA + (n * 2));
94 94
95 domain = irq_domain_add_linear(intc, NR_IRQS, &irq_ops, NULL); 95 domain = irq_domain_add_linear(intc, NR_IRQS, &irq_ops, NULL);
96 BUG_ON(!domain); 96 BUG_ON(!domain);