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/usb/host/sl811_cs.c | |
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/usb/host/sl811_cs.c')
-rw-r--r-- | drivers/usb/host/sl811_cs.c | 24 |
1 files changed, 0 insertions, 24 deletions
diff --git a/drivers/usb/host/sl811_cs.c b/drivers/usb/host/sl811_cs.c index ee811673d903..ca3fc336d3d7 100644 --- a/drivers/usb/host/sl811_cs.c +++ b/drivers/usb/host/sl811_cs.c | |||
@@ -293,28 +293,6 @@ cs_failed: | |||
293 | } | 293 | } |
294 | } | 294 | } |
295 | 295 | ||
296 | static int sl811_suspend(struct pcmcia_device *dev) | ||
297 | { | ||
298 | dev_link_t *link = dev_to_instance(dev); | ||
299 | |||
300 | link->state |= DEV_SUSPEND; | ||
301 | if (link->state & DEV_CONFIG) | ||
302 | pcmcia_release_configuration(link->handle); | ||
303 | |||
304 | return 0; | ||
305 | } | ||
306 | |||
307 | static int sl811_resume(struct pcmcia_device *dev) | ||
308 | { | ||
309 | dev_link_t *link = dev_to_instance(dev); | ||
310 | |||
311 | link->state &= ~DEV_SUSPEND; | ||
312 | if (link->state & DEV_CONFIG) | ||
313 | pcmcia_request_configuration(link->handle, &link->conf); | ||
314 | |||
315 | return 0; | ||
316 | } | ||
317 | |||
318 | static int sl811_cs_attach(struct pcmcia_device *p_dev) | 296 | static int sl811_cs_attach(struct pcmcia_device *p_dev) |
319 | { | 297 | { |
320 | local_info_t *local; | 298 | local_info_t *local; |
@@ -359,8 +337,6 @@ static struct pcmcia_driver sl811_cs_driver = { | |||
359 | .probe = sl811_cs_attach, | 337 | .probe = sl811_cs_attach, |
360 | .remove = sl811_cs_detach, | 338 | .remove = sl811_cs_detach, |
361 | .id_table = sl811_ids, | 339 | .id_table = sl811_ids, |
362 | .suspend = sl811_suspend, | ||
363 | .resume = sl811_resume, | ||
364 | }; | 340 | }; |
365 | 341 | ||
366 | /*====================================================================*/ | 342 | /*====================================================================*/ |