aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/pcmcia/smc91c92_cs.c
diff options
context:
space:
mode:
authorDominik Brodowski <linux@dominikbrodowski.net>2006-03-01 18:02:33 -0500
committerDominik Brodowski <linux@dominikbrodowski.net>2006-03-31 10:15:52 -0500
commit8661bb5b4af1849c1f5a4e80c4e275fd13c155d6 (patch)
treead99d85ea8d6f5c4c99b93f869bfd412994fb4ee /drivers/net/pcmcia/smc91c92_cs.c
parent50db3fdbbc98260fb538c1cc3f8cc597ba7bffe7 (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/net/pcmcia/smc91c92_cs.c')
-rw-r--r--drivers/net/pcmcia/smc91c92_cs.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/net/pcmcia/smc91c92_cs.c b/drivers/net/pcmcia/smc91c92_cs.c
index 03b1d8fbe7b7..84e18bbed9d2 100644
--- a/drivers/net/pcmcia/smc91c92_cs.c
+++ b/drivers/net/pcmcia/smc91c92_cs.c
@@ -874,7 +874,6 @@ static int smc91c92_suspend(struct pcmcia_device *p_dev)
874 dev_link_t *link = dev_to_instance(p_dev); 874 dev_link_t *link = dev_to_instance(p_dev);
875 struct net_device *dev = link->priv; 875 struct net_device *dev = link->priv;
876 876
877 link->state |= DEV_SUSPEND;
878 if (link->state & DEV_CONFIG) { 877 if (link->state & DEV_CONFIG) {
879 if (link->open) 878 if (link->open)
880 netif_device_detach(dev); 879 netif_device_detach(dev);
@@ -891,7 +890,6 @@ static int smc91c92_resume(struct pcmcia_device *p_dev)
891 struct smc_private *smc = netdev_priv(dev); 890 struct smc_private *smc = netdev_priv(dev);
892 int i; 891 int i;
893 892
894 link->state &= ~DEV_SUSPEND;
895 if (link->state & DEV_CONFIG) { 893 if (link->state & DEV_CONFIG) {
896 if ((smc->manfid == MANFID_MEGAHERTZ) && 894 if ((smc->manfid == MANFID_MEGAHERTZ) &&
897 (smc->cardid == PRODID_MEGAHERTZ_EM3288)) 895 (smc->cardid == PRODID_MEGAHERTZ_EM3288))