On Mon, May 04, 2015 at 08:04:48PM +0800, fu.wei@linaro.org wrote:
From: Fu Wei fu.wei@linaro.org
Your subject lines realy need some improvements.
I assume this one as well as the watchdog subject lines are accidential, but some of the others also look pretty long. Please read chapter 14 of Documentation/SubmittingPatches.
Thanks, Guenter
Signed-off-by: Fu Wei fu.wei@linaro.org
drivers/clocksource/arm_arch_timer.c | 16 ---------------- include/linux/acpi.h | 18 ++++++++++++++++++ 2 files changed, 18 insertions(+), 16 deletions(-)
diff --git a/drivers/clocksource/arm_arch_timer.c b/drivers/clocksource/arm_arch_timer.c index 0aa135d..9753ffa 100644 --- a/drivers/clocksource/arm_arch_timer.c +++ b/drivers/clocksource/arm_arch_timer.c @@ -817,22 +817,6 @@ CLOCKSOURCE_OF_DECLARE(armv7_arch_timer_mem, "arm,armv7-timer-mem", arch_timer_mem_init); #ifdef CONFIG_ACPI -static int __init map_generic_timer_interrupt(u32 interrupt, u32 flags) -{
- int trigger, polarity;
- if (!interrupt)
return 0;- trigger = (flags & ACPI_GTDT_INTERRUPT_MODE) ? ACPI_EDGE_SENSITIVE
: ACPI_LEVEL_SENSITIVE;- polarity = (flags & ACPI_GTDT_INTERRUPT_POLARITY) ? ACPI_ACTIVE_LOW
: ACPI_ACTIVE_HIGH;- return acpi_register_gsi(NULL, interrupt, trigger, polarity);
-}
/* Initialize per-processor generic timer */ static int __init arch_timer_acpi_init(struct acpi_table_header *table) { diff --git a/include/linux/acpi.h b/include/linux/acpi.h index 598f0f1..8438b20 100644 --- a/include/linux/acpi.h +++ b/include/linux/acpi.h @@ -826,4 +826,22 @@ static inline bool acpi_spcr_console_check(struct acpi_device *adev, } #endif +#if defined(CONFIG_ACPI) +static inline int map_generic_timer_interrupt(u32 interrupt, u32 flags) +{
- int trigger, polarity;
- if (!interrupt)
return 0;- trigger = (flags & ACPI_GTDT_INTERRUPT_MODE) ? ACPI_EDGE_SENSITIVE
: ACPI_LEVEL_SENSITIVE;- polarity = (flags & ACPI_GTDT_INTERRUPT_POLARITY) ? ACPI_ACTIVE_LOW
: ACPI_ACTIVE_HIGH;- return acpi_register_gsi(NULL, interrupt, trigger, polarity);
+} +#endif
#endif /*_LINUX_ACPI_H*/
1.9.1