diff mbox

[U-Boot,48/56] mpc8260/speed.c: Fix GCC 4.6 build warnings

Message ID 1320458160-23136-49-git-send-email-wd@denx.de
State Accepted
Commit 89a7b78c43f7550cd42a35c19c7eca9cb15ab9d1
Headers show

Commit Message

Wolfgang Denk Nov. 5, 2011, 1:55 a.m. UTC 
Fix:
speed.c: In function 'get_clocks':
speed.c:113:30: warning: variable 'cpmdf' set but not used
[-Wunused-but-set-variable]
speed.c:113:23: warning: variable 'busdf' set but not used
[-Wunused-but-set-variable]

Signed-off-by: Wolfgang Denk <wd@denx.de>
---
 arch/powerpc/cpu/mpc8260/speed.c |   11 +----------
 1 files changed, 1 insertions(+), 10 deletions(-)

Comments

Wolfgang Denk Nov. 7, 2011, 9:16 p.m. UTC | #1 
Dear Wolfgang Denk,

In message <1320458160-23136-49-git-send-email-wd@denx.de> you wrote:
> Fix:
> speed.c: In function 'get_clocks':
> speed.c:113:30: warning: variable 'cpmdf' set but not used
> [-Wunused-but-set-variable]
> speed.c:113:23: warning: variable 'busdf' set but not used
> [-Wunused-but-set-variable]
> 
> Signed-off-by: Wolfgang Denk <wd@denx.de>
> ---
>  arch/powerpc/cpu/mpc8260/speed.c |   11 +----------
>  1 files changed, 1 insertions(+), 10 deletions(-)

Applied, thanks.

Best regards,

Wolfgang Denk
diff mbox

Patch

diff --git a/arch/powerpc/cpu/mpc8260/speed.c b/arch/powerpc/cpu/mpc8260/speed.c
index 0e1c2b0..bb50dee 100644
--- a/arch/powerpc/cpu/mpc8260/speed.c
+++ b/arch/powerpc/cpu/mpc8260/speed.c
@@ -110,7 +110,7 @@  int get_clocks (void)
 	volatile immap_t *immap = (immap_t *) CONFIG_SYS_IMMR;
 	ulong clkin;
 	ulong sccr, dfbrg;
-	ulong scmr, corecnf, busdf, cpmdf, plldf, pllmf;
+	ulong scmr, corecnf, plldf, pllmf;
 	corecnf_t *cp;
 
 #if !defined(CONFIG_8260_CLKIN)
@@ -130,9 +130,6 @@  int get_clocks (void)
 	corecnf = (scmr & SCMR_CORECNF_MSK) >> SCMR_CORECNF_SHIFT;
 	cp = &corecnf_tab[corecnf];
 
-	busdf = (scmr & SCMR_BUSDF_MSK) >> SCMR_BUSDF_SHIFT;
-	cpmdf = (scmr & SCMR_CPMDF_MSK) >> SCMR_CPMDF_SHIFT;
-
 	/* HiP7, HiP7 Rev01, HiP7 RevA */
 	if ((get_pvr () == PVR_8260_HIP7) ||
 	    (get_pvr () == PVR_8260_HIP7R1) ||
@@ -144,12 +141,6 @@  int get_clocks (void)
 		plldf = (scmr & SCMR_PLLDF) ? 1 : 0;
 		gd->vco_out = (clkin * 2 * (pllmf + 1)) / (plldf + 1);
 	}
-#if 0
-	if (gd->vco_out / (busdf + 1) != clkin) {
-		/* aaarrrggghhh!!! */
-		return (1);
-	}
-#endif
 
 	gd->cpm_clk = gd->vco_out / 2;
 	gd->bus_clk = clkin;