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/isdn/hisax/elsa_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/isdn/hisax/elsa_cs.c')
-rw-r--r-- | drivers/isdn/hisax/elsa_cs.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/drivers/isdn/hisax/elsa_cs.c b/drivers/isdn/hisax/elsa_cs.c index 60c75c7c016e..b76b303ebf6b 100644 --- a/drivers/isdn/hisax/elsa_cs.c +++ b/drivers/isdn/hisax/elsa_cs.c | |||
@@ -389,10 +389,7 @@ static int elsa_suspend(struct pcmcia_device *p_dev) | |||
389 | dev_link_t *link = dev_to_instance(p_dev); | 389 | dev_link_t *link = dev_to_instance(p_dev); |
390 | local_info_t *dev = link->priv; | 390 | local_info_t *dev = link->priv; |
391 | 391 | ||
392 | link->state |= DEV_SUSPEND; | ||
393 | dev->busy = 1; | 392 | dev->busy = 1; |
394 | if (link->state & DEV_CONFIG) | ||
395 | pcmcia_release_configuration(link->handle); | ||
396 | 393 | ||
397 | return 0; | 394 | return 0; |
398 | } | 395 | } |
@@ -402,9 +399,6 @@ static int elsa_resume(struct pcmcia_device *p_dev) | |||
402 | dev_link_t *link = dev_to_instance(p_dev); | 399 | dev_link_t *link = dev_to_instance(p_dev); |
403 | local_info_t *dev = link->priv; | 400 | local_info_t *dev = link->priv; |
404 | 401 | ||
405 | link->state &= ~DEV_SUSPEND; | ||
406 | if (link->state & DEV_CONFIG) | ||
407 | pcmcia_request_configuration(link->handle, &link->conf); | ||
408 | dev->busy = 0; | 402 | dev->busy = 0; |
409 | 403 | ||
410 | return 0; | 404 | return 0; |