Commit 9ce688b4 authored by Russell King's avatar Russell King

[PCMCIA] Remove SS_DEBOUNCED.

We don't need to handle the debouncing of card insertion events
anymore, so we can kill SS_DEBOUNCED.
parent 6eddda4c
......@@ -657,7 +657,7 @@ static int socket_setup(struct pcmcia_socket *skt, int initial_delay)
pcmcia_error(skt, "unsupported voltage key.\n");
return CS_BAD_TYPE;
}
skt->socket.flags = SS_DEBOUNCED;
skt->socket.flags = 0;
skt->ops->set_socket(skt, &skt->socket);
/*
......@@ -690,7 +690,6 @@ static int socket_insert(struct pcmcia_socket *skt)
}
#endif
send_event(skt, CS_EVENT_CARD_INSERTION, CS_EVENT_PRI_LOW);
skt->socket.flags &= ~SS_DEBOUNCED;
} else {
socket_shutdown(skt);
cs_socket_put(skt);
......@@ -739,7 +738,6 @@ static int socket_resume(struct pcmcia_socket *skt)
} else {
send_event(skt, CS_EVENT_PM_RESUME, CS_EVENT_PRI_LOW);
}
skt->socket.flags &= ~SS_DEBOUNCED;
} else {
socket_shutdown(skt);
cs_socket_put(skt);
......
......@@ -556,7 +556,6 @@ static struct bittbl conf_bits[] = {
{ SS_DMA_MODE, "SS_DMA_MODE" },
{ SS_SPKR_ENA, "SS_SPKR_ENA" },
{ SS_OUTPUT_ENA, "SS_OUTPUT_ENA" },
{ SS_DEBOUNCED, "SS_DEBOUNCED" },
};
static void
......
......@@ -248,10 +248,6 @@ static int yenta_set_socket(struct pcmcia_socket *sock, socket_state_t *state)
struct yenta_socket *socket = container_of(sock, struct yenta_socket, socket);
u16 bridge;
if (state->flags & SS_DEBOUNCED) {
/* The insertion debounce period has ended. Clear any pending insertion events */
state->flags &= ~SS_DEBOUNCED; /* SS_DEBOUNCED is oneshot */
}
yenta_set_power(socket, state);
socket->io_irq = state->io_irq;
bridge = config_readw(socket, CB_BRIDGE_CONTROL) & ~(CB_BRIDGE_CRST | CB_BRIDGE_INTR);
......
......@@ -78,7 +78,6 @@ extern socket_state_t dead_socket;
#define SS_DMA_MODE 0x0080
#define SS_SPKR_ENA 0x0100
#define SS_OUTPUT_ENA 0x0200
#define SS_DEBOUNCED 0x0400 /* Tell driver that the debounce delay has ended */
/* Flags for I/O port and memory windows */
#define MAP_ACTIVE 0x01
......
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