diff mbox

[U-Boot,22/56] board/lwmon/pcmcia.c: Fix GCC 4.6 build warnings

Message ID 1320458160-23136-23-git-send-email-wd@denx.de
State Accepted
Commit 700a3748a68db2cae485ec111c07d5b75b8f2c5e
Headers show

Commit Message

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

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

Comments

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

In message <1320458160-23136-23-git-send-email-wd@denx.de> you wrote:
> Fix:
> pcmcia.c: In function 'pcmcia_hardware_enable':
> pcmcia.c:33:21: warning: variable 'cp' set but not used
> [-Wunused-but-set-variable]
> pcmcia.c:32:20: warning: variable 'immap' set but not used
> [-Wunused-but-set-variable]
> pcmcia.c: In function 'pcmcia_voltage_set':
> pcmcia.c:174:20: warning: variable 'immap' set but not used
> [-Wunused-but-set-variable]
> 
> Signed-off-by: Wolfgang Denk <wd@denx.de>
> ---
>  board/lwmon/pcmcia.c |    6 ------
>  1 files changed, 0 insertions(+), 6 deletions(-)

Applied, thanks.

Best regards,

Wolfgang Denk
diff mbox

Patch

diff --git a/board/lwmon/pcmcia.c b/board/lwmon/pcmcia.c
index ad2e60d..acbb9d5 100644
--- a/board/lwmon/pcmcia.c
+++ b/board/lwmon/pcmcia.c
@@ -29,8 +29,6 @@ 
 
 int pcmcia_hardware_enable(int slot)
 {
-	volatile immap_t	*immap;
-	volatile cpm8xx_t	*cp;
 	volatile pcmconf8xx_t	*pcmp;
 	volatile sysconf8xx_t	*sysp;
 	uint reg, mask;
@@ -51,10 +49,8 @@  int pcmcia_hardware_enable(int slot)
 #endif
 	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));
 
 	/*
 	 * Configure SIUMCR to enable PCMCIA port B
@@ -171,7 +167,6 @@  int pcmcia_hardware_disable(int slot)
 
 int pcmcia_voltage_set(int slot, int vcc, int vpp)
 {
-	volatile immap_t	*immap;
 	volatile pcmconf8xx_t	*pcmp;
 	u_long reg;
 	uchar val;
@@ -181,7 +176,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;
 	pcmp = (pcmconf8xx_t *)(&(((immap_t *)CONFIG_SYS_IMMR)->im_pcmcia));
 	/*
 	 * Disable PCMCIA buffers (isolate the interface)