- Simplify code by removing a variable which was initialized once, never

  modified, and was expected to have the initialized value.

2 files changed, 2 insertions, 8 deletions

diff --git a/sys/pccard/pccard.c b/sys/pccard/pccard.c
index 2a4466040394..9da0e4b209a2 100644
--- a/sys/pccard/pccard.c
+++ b/sys/pccard/pccard.c
@@ -357,8 +357,7 @@ slot_suspend(void *arg)
 
 	for (dp = sp->devices; dp; dp = dp->next)
 		(void)dp->drv->suspend(dp);
-	if (!sp->suspend_power)
-		sp->ctrl->disable(sp);
+	sp->ctrl->disable(sp);
 	return (0);
 }
 
@@ -385,8 +384,7 @@ slot_resume(void *arg)
 	} else {
 		struct pccard_dev *dp;
 
-		if (!sp->suspend_power)
-			sp->ctrl->power(sp);
+		sp->ctrl->power(sp);
 		if (sp->irq)
 			sp->ctrl->mapirq(sp, sp->irq);
 		for (dp = sp->devices; dp; dp = dp->next)
@@ -663,9 +661,6 @@ inserted(void *arg)
 	 *	Now start resetting the card.
 	 */
 	sp->ctrl->reset(sp);
-#if   NAPM > 0
-	sp->suspend_power = 0;
-#endif
 }
 
 /*
diff --git a/sys/pccard/slot.h b/sys/pccard/slot.h
index 38e64ea0f032..7ad82c381a81 100644
--- a/sys/pccard/slot.h
+++ b/sys/pccard/slot.h
@@ -130,7 +130,6 @@ struct slot {
 	struct power	pwr;		/* Power values */
 	struct slot_ctrl *ctrl;		/* Per-controller data */
 	void		*cdata;		/* Controller specific data */
-	int		suspend_power;	/* Leave powered on during suspend */
 	int		pwr_off_pending;/* Power status of slot */
 #ifdef DEVFS
 	void		*devfs_token;