aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/scsi/pcmcia/nsp_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/scsi/pcmcia/nsp_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/scsi/pcmcia/nsp_cs.c')
-rw-r--r--drivers/scsi/pcmcia/nsp_cs.c10
1 files changed, 0 insertions, 10 deletions
diff --git a/drivers/scsi/pcmcia/nsp_cs.c b/drivers/scsi/pcmcia/nsp_cs.c
index d469e0d16224..e313b40b7043 100644
--- a/drivers/scsi/pcmcia/nsp_cs.c
+++ b/drivers/scsi/pcmcia/nsp_cs.c
@@ -1987,8 +1987,6 @@ static int nsp_cs_suspend(struct pcmcia_device *dev)
1987 scsi_info_t *info = link->priv; 1987 scsi_info_t *info = link->priv;
1988 nsp_hw_data *data; 1988 nsp_hw_data *data;
1989 1989
1990 link->state |= DEV_SUSPEND;
1991
1992 nsp_dbg(NSP_DEBUG_INIT, "event: suspend"); 1990 nsp_dbg(NSP_DEBUG_INIT, "event: suspend");
1993 1991
1994 if (info->host != NULL) { 1992 if (info->host != NULL) {
@@ -2001,9 +1999,6 @@ static int nsp_cs_suspend(struct pcmcia_device *dev)
2001 1999
2002 info->stop = 1; 2000 info->stop = 1;
2003 2001
2004 if (link->state & DEV_CONFIG)
2005 pcmcia_release_configuration(link->handle);
2006
2007 return 0; 2002 return 0;
2008} 2003}
2009 2004
@@ -2015,11 +2010,6 @@ static int nsp_cs_resume(struct pcmcia_device *dev)
2015 2010
2016 nsp_dbg(NSP_DEBUG_INIT, "event: resume"); 2011 nsp_dbg(NSP_DEBUG_INIT, "event: resume");
2017 2012
2018 link->state &= ~DEV_SUSPEND;
2019
2020 if (link->state & DEV_CONFIG)
2021 pcmcia_request_configuration(link->handle, &link->conf);
2022
2023 info->stop = 0; 2013 info->stop = 0;
2024 2014
2025 if (info->host != NULL) { 2015 if (info->host != NULL) {