Date: Thu, 7 Jun 2007 11:44:45 GMT From: Rui Paulo <rpaulo@FreeBSD.org> To: Perforce Change Reviews <perforce@FreeBSD.org> Subject: PERFORCE change 121152 for review Message-ID: <200706071144.l57BijuW048290@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=121152 Change 121152 by rpaulo@rpaulo_epsilon on 2007/06/07 11:43:45 Comply with style(9). Noticed by: Attilio Rao Affected files ... .. //depot/projects/soc2007/rpaulo-macbook/dev/asmc/asmc.c#13 edit Differences ... ==== //depot/projects/soc2007/rpaulo-macbook/dev/asmc/asmc.c#13 (text+ko) ==== @@ -23,7 +23,7 @@ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $P4: //depot/projects/soc2007/rpaulo-macbook/dev/asmc/asmc.c#12 $ + * $P4: //depot/projects/soc2007/rpaulo-macbook/dev/asmc/asmc.c#13 $ * */ @@ -202,13 +202,13 @@ for (i = 0; asmc_models[i].smc_model; i++) { if (!strncmp(model, asmc_models[i].smc_model, strlen(model))) { freeenv(model); - return &asmc_models[i]; + return (&asmc_models[i]); } } freeenv(model); - return NULL; + return (NULL); } static int @@ -217,19 +217,19 @@ struct asmc_model *model; if (resource_disabled("asmc", 0)) - return ENXIO; + return (ENXIO); model = asmc_match(dev); if (!model) - return ENXIO; + return (ENXIO); if (isa_get_irq(dev) == -1) bus_set_resource(dev, SYS_RES_IRQ, 0, ASMC_IRQ, 1); device_set_desc(dev, model->smc_desc); - return BUS_PROBE_GENERIC; + return (BUS_PROBE_GENERIC); } static int @@ -380,11 +380,11 @@ #ifdef INTR_FILTER error = bus_setup_intr(dev, sc->sc_res, - INTR_TYPE_MISC|INTR_MPSAFE, + INTR_TYPE_MISC | INTR_MPSAFE, asmc_sms_intr, NULL, dev, &sc->sc_cookie); #else error = bus_setup_intr(dev, sc->sc_res, - INTR_TYPE_MISC|INTR_MPSAFE|INTR_FAST, + INTR_TYPE_MISC | INTR_MPSAFE | INTR_FAST, NULL, asmc_sms_fastintr, dev, &sc->sc_cookie); #endif if (error) { @@ -394,7 +394,7 @@ } out: - return 0; + return (0); } static int @@ -411,7 +411,7 @@ mtx_destroy(&sc->sc_mtx); - return 0; + return (0); } static int @@ -492,7 +492,7 @@ device_printf(dev, "number of keys: %d\n", buf[3]); } - return error; + return (error); } /* @@ -508,7 +508,7 @@ for (i = 0; i < 1000; i++) { if ((inb(ASMC_CMDPORT) & ASMC_STATUS_MASK) == val) - return 0; + return (0); DELAY(10); } @@ -516,7 +516,7 @@ inb(ASMC_CMDPORT)); - return 1; + return (1); } @@ -550,7 +550,7 @@ out: mtx_unlock_spin(&sc->sc_mtx); - return error; + return (error); } static int @@ -583,7 +583,7 @@ out: mtx_unlock_spin(&sc->sc_mtx); - return error; + return (error); } @@ -596,9 +596,9 @@ uint8_t buf[1]; if (asmc_key_read(dev, ASMC_KEY_FANCOUNT, buf, 1) < 0) - return -1; + return (-1); - return buf[0]; + return (buf[0]); } static int @@ -611,11 +611,11 @@ snprintf(fankey, sizeof(fankey), key, fan); if (asmc_key_read(dev, fankey, buf, 2) < 0) - return -1; + return (-1); speed = (buf[0] << 6) | (buf[1] >> 2); - return speed; + return (speed); } static int @@ -630,7 +630,7 @@ error = sysctl_handle_int(oidp, &v, 0, req); - return error; + return (error); } static int @@ -645,7 +645,7 @@ error = sysctl_handle_int(oidp, &v, 0, req); - return error; + return (error); } @@ -661,7 +661,7 @@ error = sysctl_handle_int(oidp, &v, 0, req); - return error; + return (error); } static int @@ -676,7 +676,7 @@ error = sysctl_handle_int(oidp, &v, 0, req); - return error; + return (error); } static int @@ -691,7 +691,7 @@ error = sysctl_handle_int(oidp, &v, 0, req); - return error; + return (error); } /* @@ -703,9 +703,9 @@ uint8_t buf[2]; if (asmc_key_read(dev, key, buf, 2) < 0) - return -1; + return (-1); - return buf[0]; + return (buf[0]); } static int @@ -719,7 +719,7 @@ error = sysctl_handle_int(oidp, &val, 0, req); - return error; + return (error); } /* @@ -747,7 +747,7 @@ *val = ((int16_t)buf[0] << 8) | buf[1]; out: - return error; + return (error); } static void @@ -774,7 +774,7 @@ asmc_sms_printintr(dev, type); - return FILTER_HANDLED; + return (FILTER_HANDLED); } #else static void @@ -824,7 +824,7 @@ v = (int32_t) val; error = sysctl_handle_int(oidp, &v, 0, req); - return error; + return (error); } static int @@ -840,7 +840,7 @@ v = (int32_t) val; error = sysctl_handle_int(oidp, &v, 0, req); - return error; + return (error); } static int @@ -856,5 +856,5 @@ v = (int32_t) val; error = sysctl_handle_int(oidp, &v, sizeof(v), req); - return error; + return (error); }
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200706071144.l57BijuW048290>