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/char/pcmcia/synclink_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/char/pcmcia/synclink_cs.c')
-rw-r--r-- | drivers/char/pcmcia/synclink_cs.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/drivers/char/pcmcia/synclink_cs.c b/drivers/char/pcmcia/synclink_cs.c index 371d10b78004..d3ea53a5a50f 100644 --- a/drivers/char/pcmcia/synclink_cs.c +++ b/drivers/char/pcmcia/synclink_cs.c | |||
@@ -733,10 +733,7 @@ static int mgslpc_suspend(struct pcmcia_device *dev) | |||
733 | dev_link_t *link = dev_to_instance(dev); | 733 | dev_link_t *link = dev_to_instance(dev); |
734 | MGSLPC_INFO *info = link->priv; | 734 | MGSLPC_INFO *info = link->priv; |
735 | 735 | ||
736 | link->state |= DEV_SUSPEND; | ||
737 | info->stop = 1; | 736 | info->stop = 1; |
738 | if (link->state & DEV_CONFIG) | ||
739 | pcmcia_release_configuration(link->handle); | ||
740 | 737 | ||
741 | return 0; | 738 | return 0; |
742 | } | 739 | } |
@@ -746,9 +743,6 @@ static int mgslpc_resume(struct pcmcia_device *dev) | |||
746 | dev_link_t *link = dev_to_instance(dev); | 743 | dev_link_t *link = dev_to_instance(dev); |
747 | MGSLPC_INFO *info = link->priv; | 744 | MGSLPC_INFO *info = link->priv; |
748 | 745 | ||
749 | link->state &= ~DEV_SUSPEND; | ||
750 | if (link->state & DEV_CONFIG) | ||
751 | pcmcia_request_configuration(link->handle, &link->conf); | ||
752 | info->stop = 0; | 746 | info->stop = 0; |
753 | 747 | ||
754 | return 0; | 748 | return 0; |