aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/pcmcia/ds.c
diff options
context:
space:
mode:
authorDominik Brodowski <linux@dominikbrodowski.net>2010-07-11 10:04:59 +0200
committerDominik Brodowski <linux@dominikbrodowski.net>2010-07-30 21:07:32 +0200
commit216d7cdd3b060518a2d4faf584eb15ef5af862b6 (patch)
tree5ab7b1de96ee277f5b1932ba192e9c80fd2418a7 /drivers/pcmcia/ds.c
parentpcmcia: remove obsolete ioctl (diff)
downloadlinux-dev-216d7cdd3b060518a2d4faf584eb15ef5af862b6.tar.xz
linux-dev-216d7cdd3b060518a2d4faf584eb15ef5af862b6.zip
pcmcia: simplify event callback
The event callback for handling 16bit PCMCIA cards only needs to be informed about a few events. Furthermore, send_event may already only be called with skt->skt_mutex held, which also protects against the module being removed behind the callback's back. Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>
Diffstat (limited to 'drivers/pcmcia/ds.c')
-rw-r--r--drivers/pcmcia/ds.c6
1 files changed, 0 insertions, 6 deletions
diff --git a/drivers/pcmcia/ds.c b/drivers/pcmcia/ds.c
index d2ec45848413..bd58650b2736 100644
--- a/drivers/pcmcia/ds.c
+++ b/drivers/pcmcia/ds.c
@@ -1253,9 +1253,6 @@ static int ds_event(struct pcmcia_socket *skt, event_t event, int priority)
pcmcia_card_add(skt);
break;
- case CS_EVENT_EJECTION_REQUEST:
- break;
-
case CS_EVENT_PM_RESUME:
if (verify_cis_cache(skt) != 0) {
dev_dbg(&skt->dev, "cis mismatch - different card\n");
@@ -1273,9 +1270,6 @@ static int ds_event(struct pcmcia_socket *skt, event_t event, int priority)
}
break;
- case CS_EVENT_PM_SUSPEND:
- case CS_EVENT_RESET_PHYSICAL:
- case CS_EVENT_CARD_RESET:
default:
break;
}