svn commit: r213129 - stable/7/sys/dev/vr

[Pyun YongHyeon]

Author: yongari
Date: Fri Sep 24 19:26:27 2010
New Revision: 213129
URL: http://svn.freebsd.org/changeset/base/213129

Log:
  MFC r211766:
    vr_init_locked() will stop and reset the controller. Remove
    unnecessary vr_stop()/vr_reset() calls.

Modified:
  stable/7/sys/dev/vr/if_vr.c
Directory Properties:
  stable/7/sys/   (props changed)
  stable/7/sys/cddl/contrib/opensolaris/   (props changed)
  stable/7/sys/contrib/dev/acpica/   (props changed)
  stable/7/sys/contrib/pf/   (props changed)

Modified: stable/7/sys/dev/vr/if_vr.c
==============================================================================
--- stable/7/sys/dev/vr/if_vr.c	Fri Sep 24 19:24:45 2010	(r213128)
+++ stable/7/sys/dev/vr/if_vr.c	Fri Sep 24 19:26:27 2010	(r213129)
@@ -1555,8 +1555,6 @@ vr_tick(void *xsc)
 	if ((sc->vr_flags & VR_F_RESTART) != 0) {
 		device_printf(sc->vr_dev, "restarting\n");
 		sc->vr_stat.num_restart++;
-		vr_stop(sc);
-		vr_reset(sc);
 		sc->vr_ifp->if_drv_flags &= ~IFF_DRV_RUNNING;
 		vr_init_locked(sc);
 		sc->vr_flags &= ~VR_F_RESTART;
@@ -2291,8 +2289,6 @@ vr_watchdog(struct vr_softc *sc)
 	ifp->if_oerrors++;
 	if_printf(ifp, "watchdog timeout\n");
 
-	vr_stop(sc);
-	vr_reset(sc);
 	ifp->if_drv_flags &= ~IFF_DRV_RUNNING;
 	vr_init_locked(sc);