irqchip: renesas-h8s: Replace ctrl_outw/ctrl_inw with writew/readw
PATCH 1/1 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’
--- drivers/irqchip/irq-renesas-h8s.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)
drivers/irqchip/irq-renesas-h8s.c +5 -5
@@ -40,8 +40,8 @@ static void h8s_disable_irq(struct irq_data *data) addr =IPRA + ((ipr_table[irq -16 ] &0xf0 ) >>3 ); pos = (ipr_table[irq -16 ] &0x0f ) *4 ; pri = ~(0x000f << pos); - pri &=ctrl_inw (addr); -ctrl_outw (pri, addr); + pri &=readw (addr); +writew (pri, addr); }static void h8s_enable_irq (struct irq_data *data)
@@ -54,9 +54,9 @@ static void h8s_enable_irq(struct irq_data *data) addr =IPRA + ((ipr_table[irq -16 ] &0xf0 ) >>3 ); pos = (ipr_table[irq -16 ] &0x0f ) *4 ; pri = ~(0x000f << pos); - pri &=ctrl_inw (addr); + pri &=readw (addr); pri |=1 << pos; -ctrl_outw (pri, addr); +writew (pri, addr); }struct irq_chip h8s_irq_chip = {
@@ -90,7 +90,7 @@ static int __init h8s_intc_of_init(struct device_node *intc,/* All interrupt priority is 0 (disable) */ /* IPRA to IPRK */ for (n =0 ; n <='k' -'a' ; n++) -ctrl_outw (0x0000 ,IPRA + (n *2 )); +writew (0x0000 ,IPRA + (n *2 )); domain =irq_domain_add_linear (intc,NR_IRQS , &irq_ops,NULL );BUG_ON (!domain);
Signature · 1 line
2.1.4
Yoshinori Sato
AppliedQuoted 11 lines · Guenter Roeck
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’
Quoted 3 lines
Fixes 13ae42a3b1c1 ("h8300: Rename ctlr_out/in[bwl] to raw_read/write[bwl]")Cc Daniel Lezcano <[email protected]>Signed-off-by Guenter Roeck <[email protected]>
Applied.
Thanks.
Quoted 43 lines
--- drivers/irqchip/irq-renesas-h8s.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)drivers/irqchip/irq-renesas-h8s.c +5
-5@@ -40,8 +40,8 @@ static void h8s_disable_irq(struct irq_data *data) addr =IPRA + ((ipr_table[irq -16 ] &0xf0 ) >>3 ); pos = (ipr_table[irq -16 ] &0x0f ) *4 ; pri = ~(0x000f << pos); - pri &=ctrl_inw (addr); -ctrl_outw (pri, addr); + pri &=readw (addr); +writew (pri, addr); }static void h8s_enable_irq (struct irq_data *data)@@ -54,9 +54,9 @@ static void h8s_enable_irq(struct irq_data *data) addr =IPRA + ((ipr_table[irq -16 ] &0xf0 ) >>3 ); pos = (ipr_table[irq -16 ] &0x0f ) *4 ; pri = ~(0x000f << pos); - pri &=ctrl_inw (addr); + pri &=readw (addr); pri |=1 << pos; -ctrl_outw (pri, addr); +writew (pri, addr); }struct irq_chip h8s_irq_chip = {@@ -90,7 +90,7 @@ static int __init h8s_intc_of_init(struct device_node *intc,/* All interrupt priority is 0 (disable) */ /* IPRA to IPRK */ for (n =0 ; n <='k' -'a' ; n++) -ctrl_outw (0x0000 ,IPRA + (n *2 )); +writew (0x0000 ,IPRA + (n *2 )); domain =irq_domain_add_linear (intc,NR_IRQS , &irq_ops,NULL );BUG_ON (!domain);Signature · 1 line
2.1.4
Signature · 2 lines
Yoshinori Sato <[email protected]>