From owner-svn-src-head@FreeBSD.ORG Sat May 22 07:44:34 2010 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 23C851065672; Sat, 22 May 2010 07:44:34 +0000 (UTC) (envelope-from jkim@FreeBSD.org) Received: from svn.freebsd.org (unknown [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 130E68FC08; Sat, 22 May 2010 07:44:34 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o4M7iX5q088868; Sat, 22 May 2010 07:44:33 GMT (envelope-from jkim@svn.freebsd.org) Received: (from jkim@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id o4M7iXVW088866; Sat, 22 May 2010 07:44:33 GMT (envelope-from jkim@svn.freebsd.org) Message-Id: <201005220744.o4M7iXVW088866@svn.freebsd.org> From: Jung-uk Kim Date: Sat, 22 May 2010 07:44:33 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r208413 - head/sys/isa X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 22 May 2010 07:44:34 -0000 Author: jkim Date: Sat May 22 07:44:33 2010 New Revision: 208413 URL: http://svn.freebsd.org/changeset/base/208413 Log: Fix more style(9) nits that I missed in the previous commit. Modified: head/sys/isa/syscons_isa.c Modified: head/sys/isa/syscons_isa.c ============================================================================== --- head/sys/isa/syscons_isa.c Sat May 22 07:38:29 2010 (r208412) +++ head/sys/isa/syscons_isa.c Sat May 22 07:44:33 2010 (r208413) @@ -79,7 +79,7 @@ static int sc_cur_scr; TUNABLE_INT("hw.syscons.sc_no_suspend_vtswitch", &sc_no_suspend_vtswitch); SYSCTL_DECL(_hw_syscons); SYSCTL_INT(_hw_syscons, OID_AUTO, sc_no_suspend_vtswitch, CTLFLAG_RW, - &sc_no_suspend_vtswitch, 0, "Disable VT switch before suspend."); + &sc_no_suspend_vtswitch, 0, "Disable VT switch before suspend."); static void scidentify(driver_t *driver, device_t parent) @@ -123,9 +123,8 @@ scsuspend(device_t dev) sc_cur_scr = sc->cur_scp->index; do { sc_switch_scr(sc, 0); - if (!sc->switch_in_progress) { + if (!sc->switch_in_progress) break; - } pause("scsuspend", hz); } while (retry--); } @@ -212,7 +211,7 @@ int sc_get_cons_priority(int *unit, int *flags) { const char *at; - int u, f; + int f, u; #ifdef XBOX /* @@ -348,7 +347,7 @@ scpm_suspend(device_t dev) error = bus_generic_suspend(dev); if (error != 0) return (error); - + return (scsuspend(dev)); }