From 905e6f2b56c9a87418e35c8d2f2decdeb7e0b56d Mon Sep 17 00:00:00 2001 From: Patrick Georgi Date: Thu, 14 Aug 2014 20:23:51 +0200 Subject: exynos5xx0: rename local "main" variable Change-Id: I9a454c88c65e4e70d351f1ec781e75ba400ceb29 Signed-off-by: Patrick Georgi Reviewed-on: http://review.coreboot.org/6664 Tested-by: build bot (Jenkins) Reviewed-by: Edward O'Callaghan --- src/cpu/samsung/exynos5250/clock.c | 8 ++++---- src/cpu/samsung/exynos5420/clock.c | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) (limited to 'src/cpu') diff --git a/src/cpu/samsung/exynos5250/clock.c b/src/cpu/samsung/exynos5250/clock.c index f012c20ca0..8a731be2a3 100644 --- a/src/cpu/samsung/exynos5250/clock.c +++ b/src/cpu/samsung/exynos5250/clock.c @@ -528,7 +528,7 @@ static int clock_calc_best_scalar(unsigned int main_scaler_bits, int clock_set_rate(enum periph_id periph_id, unsigned int rate) { - int main; + int main_scalar; unsigned int fine; switch (periph_id) { @@ -537,13 +537,13 @@ int clock_set_rate(enum periph_id periph_id, unsigned int rate) case PERIPH_ID_SPI2: case PERIPH_ID_SPI3: case PERIPH_ID_SPI4: - main = clock_calc_best_scalar(4, 8, 400000000, rate, &fine); - if (main < 0) { + main_scalar = clock_calc_best_scalar(4, 8, 400000000, rate, &fine); + if (main_scalar < 0) { printk(BIOS_DEBUG, "%s: Cannot set clock rate for periph %d", __func__, periph_id); return -1; } - clock_ll_set_ratio(periph_id, main - 1); + clock_ll_set_ratio(periph_id, main_scalar - 1); clock_ll_set_pre_ratio(periph_id, fine - 1); break; default: diff --git a/src/cpu/samsung/exynos5420/clock.c b/src/cpu/samsung/exynos5420/clock.c index f7436f22c3..7043310a43 100644 --- a/src/cpu/samsung/exynos5420/clock.c +++ b/src/cpu/samsung/exynos5420/clock.c @@ -492,7 +492,7 @@ static int clock_calc_best_scalar(unsigned int main_scaler_bits, int clock_set_rate(enum periph_id periph_id, unsigned int rate) { - int main; + int main_scalar; unsigned int fine; switch (periph_id) { @@ -501,13 +501,13 @@ int clock_set_rate(enum periph_id periph_id, unsigned int rate) case PERIPH_ID_SPI2: case PERIPH_ID_SPI3: case PERIPH_ID_SPI4: - main = clock_calc_best_scalar(4, 8, 400000000, rate, &fine); - if (main < 0) { + main_scalar = clock_calc_best_scalar(4, 8, 400000000, rate, &fine); + if (main_scalar < 0) { printk(BIOS_DEBUG, "%s: Cannot set clock rate for periph %d", __func__, periph_id); return -1; } - clock_ll_set_ratio(periph_id, main - 1); + clock_ll_set_ratio(periph_id, main_scalar - 1); clock_ll_set_pre_ratio(periph_id, fine - 1); break; default: -- cgit v1.2.3