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/cm4000_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/cm4000_cs.c')
-rw-r--r-- | drivers/char/pcmcia/cm4000_cs.c | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/drivers/char/pcmcia/cm4000_cs.c b/drivers/char/pcmcia/cm4000_cs.c index 3ddd3da9e720..870decbdf7ca 100644 --- a/drivers/char/pcmcia/cm4000_cs.c +++ b/drivers/char/pcmcia/cm4000_cs.c | |||
@@ -1870,10 +1870,6 @@ static int cm4000_suspend(struct pcmcia_device *p_dev) | |||
1870 | struct cm4000_dev *dev; | 1870 | struct cm4000_dev *dev; |
1871 | 1871 | ||
1872 | dev = link->priv; | 1872 | dev = link->priv; |
1873 | |||
1874 | link->state |= DEV_SUSPEND; | ||
1875 | if (link->state & DEV_CONFIG) | ||
1876 | pcmcia_release_configuration(link->handle); | ||
1877 | stop_monitor(dev); | 1873 | stop_monitor(dev); |
1878 | 1874 | ||
1879 | return 0; | 1875 | return 0; |
@@ -1885,11 +1881,6 @@ static int cm4000_resume(struct pcmcia_device *p_dev) | |||
1885 | struct cm4000_dev *dev; | 1881 | struct cm4000_dev *dev; |
1886 | 1882 | ||
1887 | dev = link->priv; | 1883 | dev = link->priv; |
1888 | |||
1889 | link->state &= ~DEV_SUSPEND; | ||
1890 | if (link->state & DEV_CONFIG) | ||
1891 | pcmcia_request_configuration(link->handle, &link->conf); | ||
1892 | |||
1893 | if (link->open) | 1884 | if (link->open) |
1894 | start_monitor(dev); | 1885 | start_monitor(dev); |
1895 | 1886 | ||