GitHub-Mirror/u-boot
2
0
Fork 0
mirror of https://github.com/Fishwaldo/u-boot.git synced 2025-06-05 22:31:36 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

board/manroland/uc100/pcmcia.c: Fix GCC 4.6 build warnings

Browse source 
Fix:
pcmcia.c: In function 'pcmcia_voltage_set':
pcmcia.c:158:25: warning: variable 'pcmp' set but not used
[-Wunused-but-set-variable]
pcmcia.c:157:20: warning: variable 'immap' set but not used
[-Wunused-but-set-variable]

Signed-off-by: Wolfgang Denk <wd@denx.de>
This commit is contained in:
Wolfgang Denk 2011-11-04 15:55:27 +00:00
parent 700a3748a6
commit 561d01a5ee
1 changed files with 22 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
board/manroland/uc100/pcmcia.c
View file

@ -40,7 +40,6 @@ static void cfg_ports (void)
int pcmcia_hardware_enable(int slot) int pcmcia_hardware_enable(int slot)
{ {
volatile immap_t *immap; volatile immap_t *immap;
volatile cpm8xx_t *cp;
volatile pcmconf8xx_t *pcmp; volatile pcmconf8xx_t *pcmp;
volatile sysconf8xx_t *sysp; volatile sysconf8xx_t *sysp;
uint reg, mask; uint reg, mask;
@ -52,7 +51,6 @@ int pcmcia_hardware_enable(int slot)
immap = (immap_t *)CONFIG_SYS_IMMR; immap = (immap_t *)CONFIG_SYS_IMMR;
sysp = (sysconf8xx_t *)(&(((immap_t *)CONFIG_SYS_IMMR)->im_siu_conf)); sysp = (sysconf8xx_t *)(&(((immap_t *)CONFIG_SYS_IMMR)->im_siu_conf));
pcmp = (pcmconf8xx_t *)(&(((immap_t *)CONFIG_SYS_IMMR)->im_pcmcia)); pcmp = (pcmconf8xx_t *)(&(((immap_t *)CONFIG_SYS_IMMR)->im_pcmcia));
cp = (cpm8xx_t *)(&(((immap_t *)CONFIG_SYS_IMMR)->im_cpm));
/* Configure Ports for TPS2211A PC-Card Power-Interface Switch */ /* Configure Ports for TPS2211A PC-Card Power-Interface Switch */
cfg_ports (); cfg_ports ();
@ -98,11 +96,11 @@ int pcmcia_hardware_enable(int slot)
reg, reg,
(reg&PCMCIA_VS1(slot))?"n":"ff", (reg&PCMCIA_VS1(slot))?"n":"ff",
(reg&PCMCIA_VS2(slot))?"n":"ff"); (reg&PCMCIA_VS2(slot))?"n":"ff");
if ((reg & mask) == mask) {
if ((reg & mask) == mask)
puts (" 5.0V card found: "); puts (" 5.0V card found: ");
} else { else
puts (" 3.3V card found: "); puts (" 3.3V card found: ");
}
/* switch VCC on */ /* switch VCC on */
immap->im_ioport.iop_padat |= 0x8000; /* power enable 3.3V */ immap->im_ioport.iop_padat |= 0x8000; /* power enable 3.3V */
@ -154,8 +152,6 @@ int pcmcia_hardware_disable(int slot)
int pcmcia_voltage_set(int slot, int vcc, int vpp) int pcmcia_voltage_set(int slot, int vcc, int vpp)
{ {
volatile immap_t *immap;
volatile pcmconf8xx_t *pcmp;
u_long reg; u_long reg;
debug ("voltage_set: " debug ("voltage_set: "
@ -163,8 +159,6 @@ int pcmcia_voltage_set(int slot, int vcc, int vpp)
" Slot %c, Vcc=%d.%d, Vpp=%d.%d\n", " Slot %c, Vcc=%d.%d, Vpp=%d.%d\n",
'A'+slot, vcc/10, vcc%10, vpp/10, vcc%10); '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) * Disable PCMCIA buffers (isolate the interface)
* and assert RESET signal * and assert RESET signal