Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/arch/arm/marvell Remove duplicate global variable.



details:   https://anonhg.NetBSD.org/src/rev/5b42e44fce2f
branches:  trunk
changeset: 780394:5b42e44fce2f
user:      jakllsch <jakllsch%NetBSD.org@localhost>
date:      Sun Jul 22 16:54:35 2012 +0000

description:
Remove duplicate global variable.

diffstat:

 sys/arch/arm/marvell/mvsoctmr.c |  8 +++-----
 1 files changed, 3 insertions(+), 5 deletions(-)

diffs (43 lines):

diff -r 9b87b34cbd69 -r 5b42e44fce2f sys/arch/arm/marvell/mvsoctmr.c
--- a/sys/arch/arm/marvell/mvsoctmr.c   Sun Jul 22 16:52:51 2012 +0000
+++ b/sys/arch/arm/marvell/mvsoctmr.c   Sun Jul 22 16:54:35 2012 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: mvsoctmr.c,v 1.5 2012/07/22 16:52:51 jakllsch Exp $    */
+/*     $NetBSD: mvsoctmr.c,v 1.6 2012/07/22 16:54:35 jakllsch Exp $    */
 /*
  * Copyright (c) 2007, 2008 KIYOHARA Takashi
  * All rights reserved.
@@ -25,7 +25,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mvsoctmr.c,v 1.5 2012/07/22 16:52:51 jakllsch Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mvsoctmr.c,v 1.6 2012/07/22 16:54:35 jakllsch Exp $");
 
 #include "opt_ddb.h"
 
@@ -83,7 +83,6 @@
 static int mvsoctmr_wdog_setmode(struct sysmon_wdog *);
 
 #ifdef DDB
-static struct mvsoctmr_softc *mvsoctmr_softc;
 static void mvsoctmr_wdog_ddb_trap(int);
 #endif
 
@@ -152,7 +151,6 @@
                      rstoutn | MVSOC_MLMB_RSTOUTNMASKR_WDRSTOUTEN);
 
 #ifdef DDB
-       mvsoctmr_softc = sc;
        db_trap_callback = mvsoctmr_wdog_ddb_trap;
 #endif
 
@@ -342,7 +340,7 @@
 static void
 mvsoctmr_wdog_ddb_trap(int enter)
 {
-       struct mvsoctmr_softc *sc = mvsoctmr_softc;
+       struct mvsoctmr_softc *sc = mvsoctmr_sc;
 
        if (sc == NULL)
                return;



Home | Main Index | Thread Index | Old Index