[src/trunk]: src/sys/dev/sbus Fix botches in mechanical changes to make this ...

[tsutsui <tsutsui%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/1a399c8a2ff4
branches:  trunk
changeset: 750473:1a399c8a2ff4
user:      tsutsui <tsutsui%NetBSD.org@localhost>
date:      Sat Jan 02 04:12:07 2010 +0000

description:
Fix botches in mechanical changes to make this compile:
dbri.c:165: warning: 'dbri_sus' declared 'static' but never defined
dbri.c: In function 'dbri_resume':
dbri.c:2188: error: 'sc' undeclared
dbri.c:2189: error: break statement not within loop or switch

diffstat:

 sys/dev/sbus/dbri.c |  9 +++++----
 1 files changed, 5 insertions(+), 4 deletions(-)

diffs (38 lines):

diff -r 400b6fd78699 -r 1a399c8a2ff4 sys/dev/sbus/dbri.c
--- a/sys/dev/sbus/dbri.c       Sat Jan 02 02:37:08 2010 +0000
+++ b/sys/dev/sbus/dbri.c       Sat Jan 02 04:12:07 2010 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: dbri.c,v 1.26 2010/01/02 01:43:42 christos Exp $       */
+/*     $NetBSD: dbri.c,v 1.27 2010/01/02 04:12:07 tsutsui Exp $        */
 
 /*
  * Copyright (C) 1997 Rudolf Koenig (rfkoenig%immd4.informatik.uni-erlangen.de@localhost)
@@ -34,7 +34,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: dbri.c,v 1.26 2010/01/02 01:43:42 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dbri.c,v 1.27 2010/01/02 04:12:07 tsutsui Exp $");
 
 #include "audio.h"
 #if NAUDIO > 0
@@ -162,7 +162,6 @@
 static paddr_t dbri_mappage(void *, void *, off_t, int);
 static void    dbri_set_power(struct dbri_softc *, int);
 static void    dbri_bring_up(struct dbri_softc *);
-static void    dbri_sus(int, void *);
 static bool    dbri_suspend(device_t PMF_FN_PROTO);
 static bool    dbri_resume(device_t PMF_FN_PROTO);
 
@@ -2185,8 +2184,10 @@
 static bool
 dbri_resume(device_t self PMF_FN_ARGS)
 {
+       struct dbri_softc *sc = device_private(self);
+
        if (sc->sc_powerstate != 0)
-               break;
+               return true;
        aprint_verbose("resume: %d\n", sc->sc_refcount);
        if (sc->sc_playing) {
                volatile uint32_t *cmd;