Commit 945ffb27 authored by Holger Freyther's avatar Holger Freyther Committed by Russell King

[ARM PATCH] 2277/1: [PATCH] SIMpad: fix warnings emitted by the compiler

Patch from Holger Hans Peter Freyther

Fix warnings emitted by the compiler for
leds-simpad.c and sa1100_simpad.c

Signed-off-by: Holger Hans Peter Freyther
Signed-off-by: Russell King
parent 71fa90f7
...@@ -28,10 +28,6 @@ extern void clear_cs3_bit(int value); ...@@ -28,10 +28,6 @@ extern void clear_cs3_bit(int value);
void simpad_leds_event(led_event_t evt) void simpad_leds_event(led_event_t evt)
{ {
unsigned long flags;
//local_irq_save(flags);
switch (evt) switch (evt)
{ {
case led_start: case led_start:
...@@ -101,6 +97,5 @@ void simpad_leds_event(led_event_t evt) ...@@ -101,6 +97,5 @@ void simpad_leds_event(led_event_t evt)
set_cs3_bit(LED2_ON); set_cs3_bit(LED2_ON);
else else
clear_cs3_bit(LED2_ON); clear_cs3_bit(LED2_ON);
//local_irq_restore(flags);
} }
...@@ -48,7 +48,7 @@ simpad_pcmcia_socket_state(struct soc_pcmcia_socket *skt, ...@@ -48,7 +48,7 @@ simpad_pcmcia_socket_state(struct soc_pcmcia_socket *skt,
struct pcmcia_state *state) struct pcmcia_state *state)
{ {
unsigned long levels = GPLR; unsigned long levels = GPLR;
unsigned long *cs3reg = CS3_BASE; long cs3reg = get_cs3_shadow();
state->detect=((levels & GPIO_CF_CD)==0)?1:0; state->detect=((levels & GPIO_CF_CD)==0)?1:0;
state->ready=(levels & GPIO_CF_IRQ)?1:0; state->ready=(levels & GPIO_CF_IRQ)?1:0;
...@@ -56,7 +56,7 @@ simpad_pcmcia_socket_state(struct soc_pcmcia_socket *skt, ...@@ -56,7 +56,7 @@ simpad_pcmcia_socket_state(struct soc_pcmcia_socket *skt,
state->bvd2=1; /* Not available on Simpad. */ state->bvd2=1; /* Not available on Simpad. */
state->wrprot=0; /* Not available on Simpad. */ state->wrprot=0; /* Not available on Simpad. */
if((*cs3reg & 0x0c) == 0x0c) { if((cs3reg & 0x0c) == 0x0c) {
state->vs_3v=0; state->vs_3v=0;
state->vs_Xv=0; state->vs_Xv=0;
} else { } else {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment