summaryrefslogtreecommitdiffstats
path: root/drivers/pcmcia
diff options
context:
space:
mode:
authorDominik Brodowski <linux@dominikbrodowski.net>2005-11-14 21:21:18 +0100
committerDominik Brodowski <linux@dominikbrodowski.net>2006-01-05 23:59:02 +0100
commit98e4c28b7ec390c2dad6a4c69d69629c0f7e8b10 (patch)
treeb3d46f0643352e541d6a39e6da09059687cf713d /drivers/pcmcia
parent63e7ebd06402951bc8863ba5b7bc9b9f42044849 (diff)
downloadop-kernel-dev-98e4c28b7ec390c2dad6a4c69d69629c0f7e8b10.zip
op-kernel-dev-98e4c28b7ec390c2dad6a4c69d69629c0f7e8b10.tar.gz
[PATCH] pcmcia: new suspend core
Move the suspend and resume methods out of the event handler, and into special functions. Also use these functions for pre- and post-reset, as almost all drivers already do, and the remaining ones can easily be converted. Bugfix to include/pcmcia/ds.c Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>
Diffstat (limited to 'drivers/pcmcia')
-rw-r--r--drivers/pcmcia/ds.c10
1 files changed, 10 insertions, 0 deletions
diff --git a/drivers/pcmcia/ds.c b/drivers/pcmcia/ds.c
index b120794..a802c65 100644
--- a/drivers/pcmcia/ds.c
+++ b/drivers/pcmcia/ds.c
@@ -951,6 +951,16 @@ static int send_event_callback(struct device *dev, void * _data)
if (p_dev->state & (CLIENT_UNBOUND|CLIENT_STALE))
return 0;
+ if ((data->event == CS_EVENT_PM_SUSPEND) ||
+ (data->event == CS_EVENT_RESET_PHYSICAL)) {
+ if (p_drv->suspend)
+ return p_drv->suspend(p_dev);
+ } else if ((data->event == CS_EVENT_PM_RESUME) ||
+ (data->event == CS_EVENT_CARD_RESET)) {
+ if (p_drv->resume)
+ return p_drv->resume(p_dev);
+ }
+
if (p_drv->event)
return p_drv->event(data->event, data->priority,
&p_dev->event_callback_args);
OpenPOWER on IntegriCloud