From: Paul Burton Date: Wed, 30 Aug 2017 16:33:30 +0000 (-0700) Subject: MIPS: Malta: Use new GIC accessor functions X-Git-Tag: v4.14-rc1~6^2~77 X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=60702867008172c5bd7b5aa82964123e252c2612;p=linux.git MIPS: Malta: Use new GIC accessor functions Use the accessor functions provided by asm/mips-gic.h rather than calling functions provided by the GIC irqchip driver, in preparation for those non-IRQ-related functions being removed from the irqchip driver. Signed-off-by: Paul Burton Signed-off-by: Ralf Baechle --- diff --git a/arch/mips/mti-malta/malta-time.c b/arch/mips/mti-malta/malta-time.c index cea4ec909806..f0577469073d 100644 --- a/arch/mips/mti-malta/malta-time.c +++ b/arch/mips/mti-malta/malta-time.c @@ -86,7 +86,7 @@ static void __init estimate_frequencies(void) local_irq_save(flags); if (gic_present) - gic_start_count(); + clear_gic_config(GIC_CONFIG_COUNTSTOP); /* * Read counters exactly on rising edge of update flag. @@ -96,7 +96,7 @@ static void __init estimate_frequencies(void) while (!(CMOS_READ(RTC_REG_A) & RTC_UIP)); start = read_c0_count(); if (gic_present) - gicstart = gic_read_count(); + gicstart = read_gic_counter(); /* Wait for falling edge before reading RTC. */ while (CMOS_READ(RTC_REG_A) & RTC_UIP); @@ -106,7 +106,7 @@ static void __init estimate_frequencies(void) while (!(CMOS_READ(RTC_REG_A) & RTC_UIP)); count = read_c0_count(); if (gic_present) - giccount = gic_read_count(); + giccount = read_gic_counter(); /* Wait for falling edge before reading RTC again. */ while (CMOS_READ(RTC_REG_A) & RTC_UIP);