diff mbox

[U-Boot,20/56] board/icu862/pcmcia.c: Fix GCC 4.6 build warning

Message ID 1320458160-23136-21-git-send-email-wd@denx.de
State Accepted
Commit 15979b148318c7bbb81c7c43bf480405841e7c22
Headers show

Commit Message

Wolfgang Denk Nov. 5, 2011, 1:55 a.m. UTC
Fix:
pcmcia.c: In function 'cfg_port_B':
pcmcia.c:21:20: warning: variable 'immap' set but not used
[-Wunused-but-set-variable]
pcmcia.c: In function 'pcmcia_hardware_enable':
pcmcia.c:50:20: warning: variable 'immap' set but not used
[-Wunused-but-set-variable]
pcmcia.c: In function 'pcmcia_voltage_set':
pcmcia.c:191:20: warning: variable 'immap' set but not used
[-Wunused-but-set-variable]

Signed-off-by: Wolfgang Denk <wd@denx.de>
---
 board/icu862/pcmcia.c |   14 ++++----------
 1 files changed, 4 insertions(+), 10 deletions(-)

Comments

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

In message <1320458160-23136-21-git-send-email-wd@denx.de> you wrote:
> Fix:
> pcmcia.c: In function 'cfg_port_B':
> pcmcia.c:21:20: warning: variable 'immap' set but not used
> [-Wunused-but-set-variable]
> pcmcia.c: In function 'pcmcia_hardware_enable':
> pcmcia.c:50:20: warning: variable 'immap' set but not used
> [-Wunused-but-set-variable]
> pcmcia.c: In function 'pcmcia_voltage_set':
> pcmcia.c:191:20: warning: variable 'immap' set but not used
> [-Wunused-but-set-variable]
> 
> Signed-off-by: Wolfgang Denk <wd@denx.de>
> ---
>  board/icu862/pcmcia.c |   14 ++++----------
>  1 files changed, 4 insertions(+), 10 deletions(-)

Applied, thanks.

Best regards,

Wolfgang Denk
Wolfgang Denk Nov. 7, 2011, 9:12 p.m. UTC | #2
Dear Wolfgang Denk,

In message <1320458160-23136-21-git-send-email-wd@denx.de> you wrote:
> Fix:
> pcmcia.c: In function 'cfg_port_B':
> pcmcia.c:21:20: warning: variable 'immap' set but not used
> [-Wunused-but-set-variable]
> pcmcia.c: In function 'pcmcia_hardware_enable':
> pcmcia.c:50:20: warning: variable 'immap' set but not used
> [-Wunused-but-set-variable]
> pcmcia.c: In function 'pcmcia_voltage_set':
> pcmcia.c:191:20: warning: variable 'immap' set but not used
> [-Wunused-but-set-variable]
> 
> Signed-off-by: Wolfgang Denk <wd@denx.de>
> ---
>  board/icu862/pcmcia.c |   14 ++++----------
>  1 files changed, 4 insertions(+), 10 deletions(-)

Applied, thanks.

Best regards,

Wolfgang Denk
diff mbox

Patch

diff --git a/board/icu862/pcmcia.c b/board/icu862/pcmcia.c
index a4c0b54..dbe3c3c 100644
--- a/board/icu862/pcmcia.c
+++ b/board/icu862/pcmcia.c
@@ -18,18 +18,16 @@ 
 
 static void cfg_port_B (void)
 {
-	volatile immap_t	*immap;
 	volatile cpm8xx_t	*cp;
 	uint reg;
 
-	immap = (immap_t *)CONFIG_SYS_IMMR;
 	cp    = (cpm8xx_t *)(&(((immap_t *)CONFIG_SYS_IMMR)->im_cpm));
 
 	/*
-	* Configure Port B for TPS2205 PC-Card Power-Interface Switch
-	*
-	* Switch off all voltages, assert shutdown
-	*/
+	 * Configure Port B for TPS2205 PC-Card Power-Interface Switch
+	 *
+	 * Switch off all voltages, assert shutdown
+	 */
 	reg  = cp->cp_pbdat;
 	reg |= (TPS2205_VPP_PGM | TPS2205_VPP_VCC |	/* VAVPP => Hi-Z */
 			TPS2205_VCC3    | TPS2205_VCC5    |	/* VAVCC => Hi-Z */
@@ -47,7 +45,6 @@  static void cfg_port_B (void)
 
 int pcmcia_hardware_enable(int slot)
 {
-	volatile immap_t	*immap;
 	volatile cpm8xx_t	*cp;
 	volatile pcmconf8xx_t	*pcmp;
 	volatile sysconf8xx_t	*sysp;
@@ -58,7 +55,6 @@  int pcmcia_hardware_enable(int slot)
 
 	udelay(10000);
 
-	immap = (immap_t *)CONFIG_SYS_IMMR;
 	sysp  = (sysconf8xx_t *)(&(((immap_t *)CONFIG_SYS_IMMR)->im_siu_conf));
 	pcmp  = (pcmconf8xx_t *)(&(((immap_t *)CONFIG_SYS_IMMR)->im_pcmcia));
 	cp    = (cpm8xx_t *)(&(((immap_t *)CONFIG_SYS_IMMR)->im_cpm));
@@ -188,7 +184,6 @@  int pcmcia_hardware_disable(int slot)
 
 int pcmcia_voltage_set(int slot, int vcc, int vpp)
 {
-	volatile immap_t	*immap;
 	volatile cpm8xx_t	*cp;
 	volatile pcmconf8xx_t	*pcmp;
 	u_long reg;
@@ -198,7 +193,6 @@  int pcmcia_voltage_set(int slot, int vcc, int vpp)
 			" Slot %c, Vcc=%d.%d, Vpp=%d.%d\n",
 	'A'+slot, vcc/10, vcc%10, vpp/10, vcc%10);
 
-	immap = (immap_t *)CONFIG_SYS_IMMR;
 	cp    = (cpm8xx_t *)(&(((immap_t *)CONFIG_SYS_IMMR)->im_cpm));
 	pcmp  = (pcmconf8xx_t *)(&(((immap_t *)CONFIG_SYS_IMMR)->im_pcmcia));
 	/*