diff options
| author | Theo de Raadt <deraadt@cvs.openbsd.org> | 2013-12-08 16:39:39 +0000 |
|---|---|---|
| committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 2013-12-08 16:39:39 +0000 |
| commit | 9584d17bdd7abbeac56597cd14c29e9cd5b407f5 (patch) | |
| tree | 3cd63d983a590ba52a4ff5e4008059bae97c3503 | |
| parent | 7ecc5770dc484f74395578fd20af86a24aafdc4d (diff) | |
simplify activate function
| -rw-r--r-- | sys/dev/pci/if_msk.c | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/sys/dev/pci/if_msk.c b/sys/dev/pci/if_msk.c index 26c54cd5948..fc55ce443f8 100644 --- a/sys/dev/pci/if_msk.c +++ b/sys/dev/pci/if_msk.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_msk.c,v 1.100 2013/12/06 21:03:04 deraadt Exp $ */ +/* $OpenBSD: if_msk.c,v 1.101 2013/12/08 16:39:38 deraadt Exp $ */ /* * Copyright (c) 1997, 1998, 1999, 2000 @@ -788,6 +788,7 @@ mskc_reset(struct sk_softc *sc) break; default: imtimer_ticks = SK_IMTIMER_TICKS_YUKON; + break; } /* Reset status ring. */ @@ -1072,9 +1073,6 @@ msk_activate(struct device *self, int act) int rv = 0; switch (act) { - case DVACT_SUSPEND: - rv = config_activate_children(self, act); - break; case DVACT_RESUME: msk_reset(sc_if); rv = config_activate_children(self, act); @@ -1404,16 +1402,13 @@ mskc_activate(struct device *self, int act) int rv = 0; switch (act) { - case DVACT_QUIESCE: - rv = config_activate_children(self, act); - break; - case DVACT_SUSPEND: - rv = config_activate_children(self, act); - break; case DVACT_RESUME: mskc_reset(sc); rv = config_activate_children(self, act); break; + default: + rv = config_activate_children(self, act); + break; } return (rv); } |