From owner-svn-src-projects@FreeBSD.ORG Sat Aug 15 01:03:14 2009 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 446461065672; Sat, 15 Aug 2009 01:03:14 +0000 (UTC) (envelope-from imp@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 19D648FC41; Sat, 15 Aug 2009 01:03:14 +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 n7F13Dgm053401; Sat, 15 Aug 2009 01:03:13 GMT (envelope-from imp@svn.freebsd.org) Received: (from imp@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n7F13Dd2053400; Sat, 15 Aug 2009 01:03:13 GMT (envelope-from imp@svn.freebsd.org) Message-Id: <200908150103.n7F13Dd2053400@svn.freebsd.org> From: Warner Losh Date: Sat, 15 Aug 2009 01:03:13 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r196236 - in projects/mips/sys/mips: malta octeon1 sentry5 X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 15 Aug 2009 01:03:14 -0000 Author: imp Date: Sat Aug 15 01:03:13 2009 New Revision: 196236 URL: http://svn.freebsd.org/changeset/base/196236 Log: Fix style error replicated multiple times. Move to mips_bus_space_generic for octeon obio impl. Modified: projects/mips/sys/mips/malta/obio.c projects/mips/sys/mips/octeon1/obio.c projects/mips/sys/mips/sentry5/obio.c Modified: projects/mips/sys/mips/malta/obio.c ============================================================================== --- projects/mips/sys/mips/malta/obio.c Sat Aug 15 00:04:12 2009 (r196235) +++ projects/mips/sys/mips/malta/obio.c Sat Aug 15 01:03:13 2009 (r196236) @@ -63,20 +63,18 @@ int obio_attach(device_t); * A bit tricky and hackish. Since we need OBIO to rely * on PCI we make it pseudo-pci device. But there should * be only one such device, so we use this static flag - * to prevent false positives on every realPCI device probe. + * to prevent false positives on every real PCI device probe. */ static int have_one = 0; int obio_probe(device_t dev) { - if(!have_one) - { + if (!have_one) { have_one = 1; return 0; } - else - return (ENXIO); + return (ENXIO); } int Modified: projects/mips/sys/mips/octeon1/obio.c ============================================================================== --- projects/mips/sys/mips/octeon1/obio.c Sat Aug 15 00:04:12 2009 (r196235) +++ projects/mips/sys/mips/octeon1/obio.c Sat Aug 15 01:03:13 2009 (r196236) @@ -60,22 +60,19 @@ int obio_probe(device_t); int obio_attach(device_t); /* - * We need only one obio. - * Any other device hanging off of it, shouldn't cause multiple of - * these to be found. + * We need only one obio. Any other device hanging off of it, + * shouldn't cause multiple of these to be found. */ static int have_one = 0; int obio_probe(device_t dev) { - if(!have_one) - { + if (!have_one) { have_one = 1; return 0; } - else - return (ENXIO); + return (ENXIO); } int @@ -83,7 +80,7 @@ obio_attach(device_t dev) { struct obio_softc *sc = device_get_softc(dev); - sc->oba_st = MIPS_BUS_SPACE_IO; + sc->oba_st = mips_bus_space_generic; sc->oba_addr = OCTEON_UART0ADR; sc->oba_size = 0x10000; sc->oba_rman.rm_type = RMAN_ARRAY; Modified: projects/mips/sys/mips/sentry5/obio.c ============================================================================== --- projects/mips/sys/mips/sentry5/obio.c Sat Aug 15 00:04:12 2009 (r196235) +++ projects/mips/sys/mips/sentry5/obio.c Sat Aug 15 01:03:13 2009 (r196236) @@ -72,13 +72,11 @@ static int have_one = 0; int obio_probe(device_t dev) { - if(!have_one) - { + if (!have_one) { have_one = 1; return 0; } - else - return (ENXIO); + return (ENXIO); } int