From owner-svn-src-all@freebsd.org Sun Feb 2 19:01:17 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 6ED6A236930; Sun, 2 Feb 2020 19:01:17 +0000 (UTC) (envelope-from emaste@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 489gKT2HDpz4WbK; Sun, 2 Feb 2020 19:01:17 +0000 (UTC) (envelope-from emaste@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 496B01C5B2; Sun, 2 Feb 2020 19:01:17 +0000 (UTC) (envelope-from emaste@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 012J1HKP079687; Sun, 2 Feb 2020 19:01:17 GMT (envelope-from emaste@FreeBSD.org) Received: (from emaste@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 012J1H2p079686; Sun, 2 Feb 2020 19:01:17 GMT (envelope-from emaste@FreeBSD.org) Message-Id: <202002021901.012J1H2p079686@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: emaste set sender to emaste@FreeBSD.org using -f From: Ed Maste Date: Sun, 2 Feb 2020 19:01:17 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r357416 - head/sys/dev/acpi_support X-SVN-Group: head X-SVN-Commit-Author: emaste X-SVN-Commit-Paths: head/sys/dev/acpi_support X-SVN-Commit-Revision: 357416 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 02 Feb 2020 19:01:17 -0000 Author: emaste Date: Sun Feb 2 19:01:16 2020 New Revision: 357416 URL: https://svnweb.freebsd.org/changeset/base/357416 Log: acpi_ibm: whitespace and wrapping cleanup Modified: head/sys/dev/acpi_support/acpi_ibm.c Modified: head/sys/dev/acpi_support/acpi_ibm.c ============================================================================== --- head/sys/dev/acpi_support/acpi_ibm.c Sun Feb 2 18:33:20 2020 (r357415) +++ head/sys/dev/acpi_support/acpi_ibm.c Sun Feb 2 19:01:16 2020 (r357416) @@ -363,8 +363,7 @@ static driver_t acpi_ibm_driver = { static devclass_t acpi_ibm_devclass; -DRIVER_MODULE(acpi_ibm, acpi, acpi_ibm_driver, acpi_ibm_devclass, - 0, 0); +DRIVER_MODULE(acpi_ibm, acpi, acpi_ibm_driver, acpi_ibm_devclass, 0, 0); MODULE_DEPEND(acpi_ibm, acpi, 1, 1, 1); static char *ibm_ids[] = {"IBM0068", "LEN0068", "LEN0268", NULL}; @@ -384,7 +383,7 @@ acpi_status_to_errno(ACPI_STATUS status) static void ibm_led(void *softc, int onoff) { - struct acpi_ibm_softc* sc = (struct acpi_ibm_softc*) softc; + struct acpi_ibm_softc *sc = (struct acpi_ibm_softc *)softc; ACPI_FUNCTION_TRACE((char *)(uintptr_t)__func__); @@ -410,7 +409,7 @@ ibm_led_task(struct acpi_ibm_softc *sc, int pending __ } static int -acpi_ibm_mic_led_set (struct acpi_ibm_softc *sc, int arg) +acpi_ibm_mic_led_set(struct acpi_ibm_softc *sc, int arg) { ACPI_OBJECT_LIST input; ACPI_OBJECT params[1]; @@ -429,10 +428,10 @@ acpi_ibm_mic_led_set (struct acpi_ibm_softc *sc, int a input.Pointer = params; input.Count = 1; - status = AcpiEvaluateObject (sc->handle, "MMTS", &input, NULL); + status = AcpiEvaluateObject(sc->handle, "MMTS", &input, NULL); if (ACPI_SUCCESS(status)) sc->mic_led_state = arg; - return(status); + return (status); } return (0); @@ -443,14 +442,13 @@ acpi_ibm_probe(device_t dev) { int rv; - if (acpi_disabled("ibm") || - device_get_unit(dev) != 0) + if (acpi_disabled("ibm") || device_get_unit(dev) != 0) return (ENXIO); rv = ACPI_ID_PROBE(device_get_parent(dev), dev, ibm_ids, NULL); - if (rv <= 0) + if (rv <= 0) device_set_desc(dev, "ThinkPad ACPI Extras"); - + return (rv); } @@ -459,7 +457,7 @@ acpi_ibm_attach(device_t dev) { int i; int hkey; - struct acpi_ibm_softc *sc; + struct acpi_ibm_softc *sc; char *maker, *product; ACPI_OBJECT_LIST input; ACPI_OBJECT params[1]; @@ -474,12 +472,12 @@ acpi_ibm_attach(device_t dev) sc->handle = acpi_get_handle(dev); /* Look for the first embedded controller */ - if (!(ec_devclass = devclass_find ("acpi_ec"))) { + if (!(ec_devclass = devclass_find ("acpi_ec"))) { if (bootverbose) device_printf(dev, "Couldn't find acpi_ec devclass\n"); return (EINVAL); } - if (!(sc->ec_dev = devclass_get_device(ec_devclass, 0))) { + if (!(sc->ec_dev = devclass_get_device(ec_devclass, 0))) { if (bootverbose) device_printf(dev, "Couldn't find acpi_ec device\n"); return (EINVAL); @@ -496,14 +494,13 @@ acpi_ibm_attach(device_t dev) if (sc->events_mask_supported) { SYSCTL_ADD_UINT(sc->sysctl_ctx, - SYSCTL_CHILDREN(sc->sysctl_tree), OID_AUTO, - "initialmask", CTLFLAG_RD, - &sc->events_initialmask, 0, "Initial eventmask"); + SYSCTL_CHILDREN(sc->sysctl_tree), OID_AUTO, "initialmask", + CTLFLAG_RD, &sc->events_initialmask, 0, + "Initial eventmask"); if (ACPI_SUCCESS (acpi_GetInteger(sc->handle, "MHKV", &hkey))) { device_printf(dev, "Firmware version is 0x%X\n", hkey); - switch(hkey >> 8) - { + switch (hkey >> 8) { case 1: /* The availmask is the bitmask of supported events */ if (ACPI_FAILURE(acpi_GetInteger(sc->handle, @@ -561,18 +558,17 @@ acpi_ibm_attach(device_t dev) /* Hook up thermal node */ if (acpi_ibm_sysctl_init(sc, ACPI_IBM_METHOD_THERMAL)) { SYSCTL_ADD_PROC(sc->sysctl_ctx, - SYSCTL_CHILDREN(sc->sysctl_tree), OID_AUTO, - "thermal", CTLTYPE_INT | CTLFLAG_RD, - sc, 0, acpi_ibm_thermal_sysctl, "I", - "Thermal zones"); + SYSCTL_CHILDREN(sc->sysctl_tree), OID_AUTO, "thermal", + CTLTYPE_INT | CTLFLAG_RD, sc, 0, acpi_ibm_thermal_sysctl, + "I", "Thermal zones"); } /* Hook up handlerevents node */ if (acpi_ibm_sysctl_init(sc, ACPI_IBM_METHOD_HANDLEREVENTS)) { SYSCTL_ADD_PROC(sc->sysctl_ctx, - SYSCTL_CHILDREN(sc->sysctl_tree), OID_AUTO, - "handlerevents", CTLTYPE_STRING | CTLFLAG_RW, - sc, 0, acpi_ibm_handlerevents_sysctl, "I", + SYSCTL_CHILDREN(sc->sysctl_tree), OID_AUTO, "handlerevents", + CTLTYPE_STRING | CTLFLAG_RW, sc, 0, + acpi_ibm_handlerevents_sysctl, "I", "devd(8) events handled by acpi_ibm"); } @@ -610,7 +606,6 @@ nosmbios: acpi_ibm_sysctl_set(sc, ACPI_IBM_METHOD_EVENTS, 1); ACPI_SERIAL_END(ibm); - return (0); } @@ -677,7 +672,7 @@ acpi_ibm_eventmask_set(struct acpi_ibm_softc *sc, int arg[1].Type = ACPI_TYPE_INTEGER; for (int i = 0; i < 32; ++i) { - arg[0].Integer.Value = i+1; + arg[0].Integer.Value = i + 1; arg[1].Integer.Value = (((1 << i) & val) != 0); status = AcpiEvaluateObject(sc->handle, IBM_NAME_EVENTS_MASK_SET, &args, NULL); @@ -814,8 +809,7 @@ acpi_ibm_sysctl_get(struct acpi_ibm_softc *sc, int met if (sc->fan_handle) { if(ACPI_FAILURE(acpi_GetInteger(sc->fan_handle, NULL, &val))) val = -1; - } - else { + } else { ACPI_EC_READ(sc->ec_dev, IBM_EC_FANSPEED, &val_ec, 2); val = val_ec; } @@ -841,10 +835,10 @@ acpi_ibm_sysctl_get(struct acpi_ibm_softc *sc, int met if (!sc->fan_handle) { ACPI_EC_READ(sc->ec_dev, IBM_EC_FANSTATUS, &val_ec, 1); val = (val_ec & IBM_EC_MASK_FANSTATUS) == IBM_EC_MASK_FANSTATUS; - } - else + } else val = -1; break; + case ACPI_IBM_METHOD_MIC_LED: if (sc->mic_led_handle) return sc->mic_led_state; @@ -855,7 +849,6 @@ acpi_ibm_sysctl_get(struct acpi_ibm_softc *sc, int met case ACPI_IBM_METHOD_PRIVACYGUARD: val = acpi_ibm_privacyguard_get(sc); break; - } return (val); @@ -901,7 +894,7 @@ acpi_ibm_sysctl_set(struct acpi_ibm_softc *sc, int met break; case ACPI_IBM_METHOD_MIC_LED: - return acpi_ibm_mic_led_set (sc, arg); + return acpi_ibm_mic_led_set(sc, arg); break; case ACPI_IBM_METHOD_THINKLIGHT: @@ -971,10 +964,9 @@ acpi_ibm_sysctl_init(struct acpi_ibm_softc *sc, int me if (ACPI_SUCCESS(AcpiGetHandle(sc->handle, "MMTS", &sc->mic_led_handle))) { /* Turn off mic led by default */ - acpi_ibm_mic_led_set (sc, 0); - return(TRUE); - } - else + acpi_ibm_mic_led_set(sc, 0); + return (TRUE); + } else sc->mic_led_handle = NULL; return (FALSE); @@ -995,8 +987,7 @@ acpi_ibm_sysctl_init(struct acpi_ibm_softc *sc, int me else if (ACPI_SUCCESS(AcpiGetHandle(sc->handle, "\\LGHT", &sc->light_handle))) { sc->light_cmd_on = 1; sc->light_cmd_off = 0; - } - else + } else sc->light_handle = NULL; sc->light_set_supported = (sc->light_handle && @@ -1050,7 +1041,6 @@ acpi_ibm_sysctl_init(struct acpi_ibm_softc *sc, int me case ACPI_IBM_METHOD_PRIVACYGUARD: return (acpi_ibm_privacyguard_get(sc) != -1); - } return (FALSE); } @@ -1273,7 +1263,8 @@ acpi_ibm_thinklight_set(struct acpi_ibm_softc *sc, int * Only meant to be used internally by the get/set functions below. */ static ACPI_STATUS -acpi_ibm_privacyguard_acpi_call(struct acpi_ibm_softc *sc, bool write, int *arg) { +acpi_ibm_privacyguard_acpi_call(struct acpi_ibm_softc *sc, bool write, int *arg) +{ ACPI_OBJECT Arg; ACPI_OBJECT_LIST Args; ACPI_STATUS status; @@ -1484,7 +1475,6 @@ acpi_ibm_notify(ACPI_HANDLE h, UINT32 notify, void *co acpi_GetInteger(acpi_get_handle(dev), IBM_NAME_EVENTS_GET, &event); if (event == 0) break; - type = (event >> 12) & 0xf; arg = event & 0xfff;