| Message ID | 1464096633-9309-3-git-send-email-fu.wei@linaro.org (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On 05/24/2016 03:30 PM, fu.wei@linaro.org wrote: > From: Fu Wei <fu.wei@linaro.org> > > This patch add a new enum "spi_nr" and use it in the driver. > Just for code's readability, no functional change. > > Signed-off-by: Fu Wei <fu.wei@linaro.org> > --- > drivers/clocksource/arm_arch_timer.c | 4 ++-- > include/clocksource/arm_arch_timer.h | 6 ++++++ > 2 files changed, 8 insertions(+), 2 deletions(-) > > diff --git a/drivers/clocksource/arm_arch_timer.c b/drivers/clocksource/arm_arch_timer.c > index 5d7272e..966c574 100644 > --- a/drivers/clocksource/arm_arch_timer.c > +++ b/drivers/clocksource/arm_arch_timer.c > @@ -826,9 +826,9 @@ static void __init arch_timer_mem_init(struct device_node *np) > } > > if (arch_timer_mem_use_virtual) > - irq = irq_of_parse_and_map(best_frame, 1); > + irq = irq_of_parse_and_map(best_frame, VIRT_SPI); > else > - irq = irq_of_parse_and_map(best_frame, 0); > + irq = irq_of_parse_and_map(best_frame, PHYS_SPI); > > if (!irq) { > pr_err("arch_timer: Frame missing %s irq", > diff --git a/include/clocksource/arm_arch_timer.h b/include/clocksource/arm_arch_timer.h > index 6f06481..16dcd10 100644 > --- a/include/clocksource/arm_arch_timer.h > +++ b/include/clocksource/arm_arch_timer.h > @@ -45,6 +45,12 @@ enum ppi_nr { > MAX_TIMER_PPI > }; > > +enum spi_nr { > + PHYS_SPI, > + VIRT_SPI, > + MAX_TIMER_SPI > +}; Wouldn't make sense to use the constant below instead of defining new ones ? > #define ARCH_TIMER_PHYS_ACCESS 0 > #define ARCH_TIMER_VIRT_ACCESS 1 > #define ARCH_TIMER_MEM_PHYS_ACCESS 2 >
diff --git a/drivers/clocksource/arm_arch_timer.c b/drivers/clocksource/arm_arch_timer.c index 5d7272e..966c574 100644 --- a/drivers/clocksource/arm_arch_timer.c +++ b/drivers/clocksource/arm_arch_timer.c @@ -826,9 +826,9 @@ static void __init arch_timer_mem_init(struct device_node *np) } if (arch_timer_mem_use_virtual) - irq = irq_of_parse_and_map(best_frame, 1); + irq = irq_of_parse_and_map(best_frame, VIRT_SPI); else - irq = irq_of_parse_and_map(best_frame, 0); + irq = irq_of_parse_and_map(best_frame, PHYS_SPI); if (!irq) { pr_err("arch_timer: Frame missing %s irq", diff --git a/include/clocksource/arm_arch_timer.h b/include/clocksource/arm_arch_timer.h index 6f06481..16dcd10 100644 --- a/include/clocksource/arm_arch_timer.h +++ b/include/clocksource/arm_arch_timer.h @@ -45,6 +45,12 @@ enum ppi_nr { MAX_TIMER_PPI }; +enum spi_nr { + PHYS_SPI, + VIRT_SPI, + MAX_TIMER_SPI +}; + #define ARCH_TIMER_PHYS_ACCESS 0 #define ARCH_TIMER_VIRT_ACCESS 1 #define ARCH_TIMER_MEM_PHYS_ACCESS 2