From: Wolfgang Denk Date: Fri, 4 Nov 2011 15:55:31 +0000 (+0000) Subject: board/r360mpi/pcmcia.c: Fix GCC 4.6 build warnings X-Git-Tag: v2011.12-rc1~282 X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=f6b60bca6ceddd917bcfd762e745d9a63c0e8064;p=u-boot board/r360mpi/pcmcia.c: Fix GCC 4.6 build warnings Fix: pcmcia.c: In function 'pcmcia_hardware_enable': pcmcia.c:22:21: warning: variable 'cp' set but not used [-Wunused-but-set-variable] pcmcia.c: In function 'pcmcia_hardware_disable': pcmcia.c:130:25: warning: variable 'pcmp' set but not used [-Wunused-but-set-variable] Signed-off-by: Wolfgang Denk --- diff --git a/board/r360mpi/pcmcia.c b/board/r360mpi/pcmcia.c index 85da41bd22..a939b31d47 100644 --- a/board/r360mpi/pcmcia.c +++ b/board/r360mpi/pcmcia.c @@ -19,7 +19,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; @@ -31,7 +30,6 @@ int pcmcia_hardware_enable(int slot) 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 @@ -127,13 +125,11 @@ int pcmcia_hardware_enable(int slot) int pcmcia_hardware_disable(int slot) { volatile immap_t *immap; - volatile pcmconf8xx_t *pcmp; u_long reg; debug ("hardware_disable: " PCMCIA_BOARD_MSG " Slot %c\n", 'A'+slot); immap = (immap_t *)CONFIG_SYS_IMMR; - pcmp = (pcmconf8xx_t *)(&(((immap_t *)CONFIG_SYS_IMMR)->im_pcmcia)); /* remove all power */ immap->im_ioport.iop_pcdat |= 0x0400;