diff options
author | Dominik Brodowski <linux@dominikbrodowski.net> | 2006-03-01 18:02:33 -0500 |
---|---|---|
committer | Dominik Brodowski <linux@dominikbrodowski.net> | 2006-03-31 10:15:52 -0500 |
commit | 8661bb5b4af1849c1f5a4e80c4e275fd13c155d6 (patch) | |
tree | ad99d85ea8d6f5c4c99b93f869bfd412994fb4ee /drivers/parport | |
parent | 50db3fdbbc98260fb538c1cc3f8cc597ba7bffe7 (diff) |
[PATCH] pcmcia: default suspend and resume handling
In all but one case, the suspend and resume functions of PCMCIA drivers
contain mostly of calls to pcmcia_release_configuration() and
pcmcia_request_configuration(). Therefore, move this code out of the
drivers and into the core.
Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>
Diffstat (limited to 'drivers/parport')
-rw-r--r-- | drivers/parport/parport_cs.c | 23 |
1 files changed, 0 insertions, 23 deletions
diff --git a/drivers/parport/parport_cs.c b/drivers/parport/parport_cs.c index 7edd7ef6c31f..5e12ed2f1b6e 100644 --- a/drivers/parport/parport_cs.c +++ b/drivers/parport/parport_cs.c | |||
@@ -280,27 +280,6 @@ void parport_cs_release(dev_link_t *link) | |||
280 | pcmcia_disable_device(link->handle); | 280 | pcmcia_disable_device(link->handle); |
281 | } /* parport_cs_release */ | 281 | } /* parport_cs_release */ |
282 | 282 | ||
283 | static int parport_suspend(struct pcmcia_device *dev) | ||
284 | { | ||
285 | dev_link_t *link = dev_to_instance(dev); | ||
286 | |||
287 | link->state |= DEV_SUSPEND; | ||
288 | if (link->state & DEV_CONFIG) | ||
289 | pcmcia_release_configuration(link->handle); | ||
290 | |||
291 | return 0; | ||
292 | } | ||
293 | |||
294 | static int parport_resume(struct pcmcia_device *dev) | ||
295 | { | ||
296 | dev_link_t *link = dev_to_instance(dev); | ||
297 | |||
298 | link->state &= ~DEV_SUSPEND; | ||
299 | if (DEV_OK(link)) | ||
300 | pcmcia_request_configuration(link->handle, &link->conf); | ||
301 | |||
302 | return 0; | ||
303 | } | ||
304 | 283 | ||
305 | static struct pcmcia_device_id parport_ids[] = { | 284 | static struct pcmcia_device_id parport_ids[] = { |
306 | PCMCIA_DEVICE_FUNC_ID(3), | 285 | PCMCIA_DEVICE_FUNC_ID(3), |
@@ -317,8 +296,6 @@ static struct pcmcia_driver parport_cs_driver = { | |||
317 | .probe = parport_attach, | 296 | .probe = parport_attach, |
318 | .remove = parport_detach, | 297 | .remove = parport_detach, |
319 | .id_table = parport_ids, | 298 | .id_table = parport_ids, |
320 | .suspend = parport_suspend, | ||
321 | .resume = parport_resume, | ||
322 | }; | 299 | }; |
323 | 300 | ||
324 | static int __init init_parport_cs(void) | 301 | static int __init init_parport_cs(void) |