Daniel Lezcano
danie****@linar*****
2015年 11月 9日 (月) 07:36:38 JST
For the sake of consistency, let rename all ctrl_out/in calls to the write/read calls so we have the same API consistent with the other architectures hence open the door for the increasing of the test compilation coverage. Signed-off-by: Daniel Lezcano <danie****@linar*****> --- arch/h8300/include/asm/io.h | 12 ++++++------ arch/h8300/kernel/setup.c | 8 ++++---- drivers/clocksource/h8300_timer16.c | 20 ++++++++++---------- drivers/clocksource/h8300_timer8.c | 30 +++++++++++++++--------------- drivers/clocksource/h8300_tpu.c | 20 ++++++++++---------- 5 files changed, 45 insertions(+), 45 deletions(-) diff --git a/arch/h8300/include/asm/io.h b/arch/h8300/include/asm/io.h index 1d09b2f..eed2218 100644 --- a/arch/h8300/include/asm/io.h +++ b/arch/h8300/include/asm/io.h @@ -6,32 +6,32 @@ #include <asm-generic/io.h> /* H8/300 internal I/O functions */ -static inline unsigned char ctrl_inb(unsigned long addr) +static inline unsigned char readb(unsigned long addr) { return *(volatile unsigned char *)addr; } -static inline unsigned short ctrl_inw(unsigned long addr) +static inline unsigned short readw(unsigned long addr) { return *(volatile unsigned short *)addr; } -static inline unsigned long ctrl_inl(unsigned long addr) +static inline unsigned long readl(unsigned long addr) { return *(volatile unsigned long *)addr; } -static inline void ctrl_outb(unsigned char b, unsigned long addr) +static inline void writeb(unsigned char b, unsigned long addr) { *(volatile unsigned char *)addr = b; } -static inline void ctrl_outw(unsigned short b, unsigned long addr) +static inline void writew(unsigned short b, unsigned long addr) { *(volatile unsigned short *)addr = b; } -static inline void ctrl_outl(unsigned long b, unsigned long addr) +static inline void writel(unsigned long b, unsigned long addr) { *(volatile unsigned long *)addr = b; } diff --git a/arch/h8300/kernel/setup.c b/arch/h8300/kernel/setup.c index 0fd1fe6..9b92aea 100644 --- a/arch/h8300/kernel/setup.c +++ b/arch/h8300/kernel/setup.c @@ -206,14 +206,14 @@ device_initcall(device_probe); #define get_wait(base, addr) ({ \ int baddr; \ baddr = ((addr) / 0x200000 * 2); \ - w *= (ctrl_inw((unsigned long)(base) + 2) & (3 << baddr)) + 1; \ + w *= (readw((unsigned long)(base) + 2) & (3 << baddr)) + 1; \ }) #endif #if defined(CONFIG_CPU_H8S) #define get_wait(base, addr) ({ \ int baddr; \ baddr = ((addr) / 0x200000 * 16); \ - w *= (ctrl_inl((unsigned long)(base) + 2) & (7 << baddr)) + 1; \ + w *= (readl((unsigned long)(base) + 2) & (7 << baddr)) + 1; \ }) #endif @@ -227,8 +227,8 @@ static __init int access_timing(void) bsc = of_find_compatible_node(NULL, NULL, "renesas,h8300-bsc"); base = of_iomap(bsc, 0); - w = (ctrl_inb((unsigned long)base + 0) & bit)?2:1; - if (ctrl_inb((unsigned long)base + 1) & bit) + w = (readb((unsigned long)base + 0) & bit)?2:1; + if (readb((unsigned long)base + 1) & bit) w *= get_wait(base, addr); else w *= 2; diff --git a/drivers/clocksource/h8300_timer16.c b/drivers/clocksource/h8300_timer16.c index cdf0d83..2472da1 100644 --- a/drivers/clocksource/h8300_timer16.c +++ b/drivers/clocksource/h8300_timer16.c @@ -69,15 +69,15 @@ static unsigned long timer16_get_counter(struct timer16_priv *p) unsigned long v1, v2, v3; int o1, o2; - o1 = ctrl_inb(p->mapcommon + TISRC) & p->ovf; + o1 = readb(p->mapcommon + TISRC) & p->ovf; /* Make sure the timer value is stable. Stolen from acpi_pm.c */ do { o2 = o1; - v1 = ctrl_inw(p->mapbase + TCNT); - v2 = ctrl_inw(p->mapbase + TCNT); - v3 = ctrl_inw(p->mapbase + TCNT); - o1 = ctrl_inb(p->mapcommon + TISRC) & p->ovf; + v1 = readw(p->mapbase + TCNT); + v2 = readw(p->mapbase + TCNT); + v3 = readw(p->mapbase + TCNT); + o1 = readb(p->mapcommon + TISRC) & p->ovf; } while (unlikely((o1 != o2) || (v1 > v2 && v1 < v3) || (v2 > v3 && v2 < v1) || (v3 > v1 && v3 < v2))); @@ -90,7 +90,7 @@ static irqreturn_t timer16_interrupt(int irq, void *dev_id) { struct timer16_priv *p = (struct timer16_priv *)dev_id; - ctrl_outb(ctrl_inb(p->mapcommon + TISRA) & ~p->imfa, + writeb(readb(p->mapcommon + TISRA) & ~p->imfa, p->mapcommon + TISRA); p->total_cycles += 0x10000; @@ -123,9 +123,9 @@ static int timer16_enable(struct clocksource *cs) WARN_ON(p->cs_enabled); p->total_cycles = 0; - ctrl_outw(0x0000, p->mapbase + TCNT); - ctrl_outb(0x83, p->mapbase + TCR); - ctrl_outb(ctrl_inb(p->mapcommon + TSTR) | p->enb, + writew(0x0000, p->mapbase + TCNT); + writeb(0x83, p->mapbase + TCR); + writeb(readb(p->mapcommon + TSTR) | p->enb, p->mapcommon + TSTR); p->cs_enabled = true; @@ -138,7 +138,7 @@ static void timer16_disable(struct clocksource *cs) WARN_ON(!p->cs_enabled); - ctrl_outb(ctrl_inb(p->mapcommon + TSTR) & ~p->enb, + writeb(readb(p->mapcommon + TSTR) & ~p->enb, p->mapcommon + TSTR); p->cs_enabled = false; diff --git a/drivers/clocksource/h8300_timer8.c b/drivers/clocksource/h8300_timer8.c index 0885014..cf0feee 100644 --- a/drivers/clocksource/h8300_timer8.c +++ b/drivers/clocksource/h8300_timer8.c @@ -42,15 +42,15 @@ static unsigned long timer8_get_counter(struct timer8_priv *p) unsigned long v1, v2, v3; int o1, o2; - o1 = ctrl_inb(p->mapbase + _8TCSR) & 0x20; + o1 = readb(p->mapbase + _8TCSR) & 0x20; /* Make sure the timer value is stable. Stolen from acpi_pm.c */ do { o2 = o1; - v1 = ctrl_inw(p->mapbase + _8TCNT); - v2 = ctrl_inw(p->mapbase + _8TCNT); - v3 = ctrl_inw(p->mapbase + _8TCNT); - o1 = ctrl_inb(p->mapbase + _8TCSR) & 0x20; + v1 = readw(p->mapbase + _8TCNT); + v2 = readw(p->mapbase + _8TCNT); + v3 = readw(p->mapbase + _8TCNT); + o1 = readb(p->mapbase + _8TCSR) & 0x20; } while (unlikely((o1 != o2) || (v1 > v2 && v1 < v3) || (v2 > v3 && v2 < v1) || (v3 > v1 && v3 < v2))); @@ -62,13 +62,13 @@ static irqreturn_t timer8_interrupt(int irq, void *dev_id) { struct timer8_priv *p = dev_id; - ctrl_outb(ctrl_inb(p->mapbase + _8TCSR) & ~0x40, + writeb(readb(p->mapbase + _8TCSR) & ~0x40, p->mapbase + _8TCSR); - ctrl_outw(p->tcora, p->mapbase + TCORA); + writew(p->tcora, p->mapbase + TCORA); if (clockevent_state_oneshot(&p->ced)) - ctrl_outw(0x0000, p->mapbase + _8TCR); + writew(0x0000, p->mapbase + _8TCR); p->ced.event_handler(&p->ced); @@ -83,19 +83,19 @@ static void timer8_set_next(struct timer8_priv *p, unsigned long delta) dev_warn(&p->pdev->dev, "delta out of range\n"); now = timer8_get_counter(p); p->tcora = delta; - ctrl_outb(ctrl_inb(p->mapbase + _8TCR) | 0x40, p->mapbase + _8TCR); + writeb(readb(p->mapbase + _8TCR) | 0x40, p->mapbase + _8TCR); if (delta > now) - ctrl_outw(delta, p->mapbase + TCORA); + writew(delta, p->mapbase + TCORA); else - ctrl_outw(now + 1, p->mapbase + TCORA); + writew(now + 1, p->mapbase + TCORA); } static int timer8_enable(struct timer8_priv *p) { p->rate = clk_get_rate(p->pclk) / SCALE; - ctrl_outw(0xffff, p->mapbase + TCORA); - ctrl_outw(0x0000, p->mapbase + _8TCNT); - ctrl_outw(0x0c02, p->mapbase + _8TCR); + writew(0xffff, p->mapbase + TCORA); + writew(0x0000, p->mapbase + _8TCNT); + writew(0x0c02, p->mapbase + _8TCR); return 0; } @@ -117,7 +117,7 @@ static int timer8_start(struct timer8_priv *p) static void timer8_stop(struct timer8_priv *p) { - ctrl_outw(0x0000, p->mapbase + _8TCR); + writew(0x0000, p->mapbase + _8TCR); } static inline struct timer8_priv *ced_to_priv(struct clock_event_device *ced) diff --git a/drivers/clocksource/h8300_tpu.c b/drivers/clocksource/h8300_tpu.c index c1eef42..1f67a38 100644 --- a/drivers/clocksource/h8300_tpu.c +++ b/drivers/clocksource/h8300_tpu.c @@ -31,8 +31,8 @@ static inline unsigned long read_tcnt32(struct tpu_priv *p) { unsigned long tcnt; - tcnt = ctrl_inw(p->mapbase1 + TCNT) << 16; - tcnt |= ctrl_inw(p->mapbase2 + TCNT); + tcnt = readw(p->mapbase1 + TCNT) << 16; + tcnt |= readw(p->mapbase2 + TCNT); return tcnt; } @@ -41,7 +41,7 @@ static int tpu_get_counter(struct tpu_priv *p, unsigned long long *val) unsigned long v1, v2, v3; int o1, o2; - o1 = ctrl_inb(p->mapbase1 + TSR) & 0x10; + o1 = readb(p->mapbase1 + TSR) & 0x10; /* Make sure the timer value is stable. Stolen from acpi_pm.c */ do { @@ -49,7 +49,7 @@ static int tpu_get_counter(struct tpu_priv *p, unsigned long long *val) v1 = read_tcnt32(p); v2 = read_tcnt32(p); v3 = read_tcnt32(p); - o1 = ctrl_inb(p->mapbase1 + TSR) & 0x10; + o1 = readb(p->mapbase1 + TSR) & 0x10; } while (unlikely((o1 != o2) || (v1 > v2 && v1 < v3) || (v2 > v3 && v2 < v1) || (v3 > v1 && v3 < v2))); @@ -82,10 +82,10 @@ static int tpu_clocksource_enable(struct clocksource *cs) WARN_ON(p->cs_enabled); - ctrl_outw(0, p->mapbase1 + TCNT); - ctrl_outw(0, p->mapbase2 + TCNT); - ctrl_outb(0x0f, p->mapbase1 + TCR); - ctrl_outb(0x03, p->mapbase2 + TCR); + writew(0, p->mapbase1 + TCNT); + writew(0, p->mapbase2 + TCNT); + writeb(0x0f, p->mapbase1 + TCR); + writeb(0x03, p->mapbase2 + TCR); p->cs_enabled = true; return 0; @@ -97,8 +97,8 @@ static void tpu_clocksource_disable(struct clocksource *cs) WARN_ON(!p->cs_enabled); - ctrl_outb(0, p->mapbase1 + TCR); - ctrl_outb(0, p->mapbase2 + TCR); + writeb(0, p->mapbase1 + TCR); + writeb(0, p->mapbase2 + TCR); p->cs_enabled = false; } -- 1.9.1
Fork