Date: Tue, 1 Sep 2020 21:32:42 +0000 (UTC) From: Mateusz Guzik <mjg@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r365096 - in head/sys/dev/acpica: . Osd Message-ID: <202009012132.081LWglh031628@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: mjg Date: Tue Sep 1 21:32:41 2020 New Revision: 365096 URL: https://svnweb.freebsd.org/changeset/base/365096 Log: acpica: clean up empty lines in .c and .h files Modified: head/sys/dev/acpica/Osd/OsdHardware.c head/sys/dev/acpica/acpi.c head/sys/dev/acpica/acpi_acad.c head/sys/dev/acpica/acpi_cpu.c head/sys/dev/acpica/acpi_isab.c head/sys/dev/acpica/acpi_pci.c head/sys/dev/acpica/acpi_pci_link.c head/sys/dev/acpica/acpi_powerres.c head/sys/dev/acpica/acpi_smbus.h head/sys/dev/acpica/acpi_thermal.c head/sys/dev/acpica/acpi_timer.c head/sys/dev/acpica/acpivar.h Modified: head/sys/dev/acpica/Osd/OsdHardware.c ============================================================================== --- head/sys/dev/acpica/Osd/OsdHardware.c Tue Sep 1 21:32:25 2020 (r365095) +++ head/sys/dev/acpica/Osd/OsdHardware.c Tue Sep 1 21:32:41 2020 (r365096) @@ -119,7 +119,6 @@ AcpiOsReadPciConfiguration(ACPI_PCI_ID *PciId, UINT32 #endif } - ACPI_STATUS AcpiOsWritePciConfiguration (ACPI_PCI_ID *PciId, UINT32 Register, UINT64 Value, UINT32 Width) Modified: head/sys/dev/acpica/acpi.c ============================================================================== --- head/sys/dev/acpica/acpi.c Tue Sep 1 21:32:25 2020 (r365095) +++ head/sys/dev/acpica/acpi.c Tue Sep 1 21:32:41 2020 (r365096) @@ -1709,7 +1709,7 @@ acpi_device_id_probe(device_t bus, device_t dev, char rv = acpi_MatchHid(h, ids[i]); if (rv == ACPI_MATCHHID_NOMATCH) continue; - + if (match != NULL) { *match = ids[i]; } Modified: head/sys/dev/acpica/acpi_acad.c ============================================================================== --- head/sys/dev/acpica/acpi_acad.c Tue Sep 1 21:32:25 2020 (r365095) +++ head/sys/dev/acpica/acpi_acad.c Tue Sep 1 21:32:41 2020 (r365096) @@ -46,7 +46,7 @@ __FBSDID("$FreeBSD$"); #include <dev/acpica/acpiio.h> #include <isa/isavar.h> #include <isa/pnpvar.h> - + /* Hooks for the ACPI CA debugging infrastructure */ #define _COMPONENT ACPI_AC_ADAPTER ACPI_MODULE_NAME("AC_ADAPTER") Modified: head/sys/dev/acpica/acpi_cpu.c ============================================================================== --- head/sys/dev/acpica/acpi_cpu.c Tue Sep 1 21:32:25 2020 (r365095) +++ head/sys/dev/acpica/acpi_cpu.c Tue Sep 1 21:32:41 2020 (r365096) @@ -873,7 +873,6 @@ acpi_cpu_cx_cst(struct acpi_cpu_softc *sc) acpi_PkgInt32(pkg, 1, &cx_ptr->type) != 0 || acpi_PkgInt32(pkg, 2, &cx_ptr->trans_lat) != 0 || acpi_PkgInt32(pkg, 3, &cx_ptr->power) != 0) { - device_printf(sc->cpu_dev, "skipping invalid Cx state package\n"); continue; } Modified: head/sys/dev/acpica/acpi_isab.c ============================================================================== --- head/sys/dev/acpica/acpi_isab.c Tue Sep 1 21:32:25 2020 (r365095) +++ head/sys/dev/acpica/acpi_isab.c Tue Sep 1 21:32:41 2020 (r365096) @@ -92,7 +92,7 @@ acpi_isab_probe(device_t dev) { static char *isa_ids[] = { "PNP0A05", "PNP0A06", NULL }; int rv; - + if (acpi_disabled("isab") || devclass_get_device(isab_devclass, 0) != dev) return (ENXIO); Modified: head/sys/dev/acpica/acpi_pci.c ============================================================================== --- head/sys/dev/acpica/acpi_pci.c Tue Sep 1 21:32:25 2020 (r365095) +++ head/sys/dev/acpica/acpi_pci.c Tue Sep 1 21:32:41 2020 (r365096) @@ -424,7 +424,7 @@ acpi_pci_attach(device_t dev) acpi_pci_bus_notify_handler, dev); AcpiWalkNamespace(ACPI_TYPE_DEVICE, acpi_get_handle(dev), 1, acpi_pci_install_device_notify_handler, NULL, dev, NULL); - + return (0); } @@ -479,4 +479,3 @@ acpi_pci_get_dma_tag(device_t bus, device_t child) return (pci_get_dma_tag(bus, child)); } #endif - Modified: head/sys/dev/acpica/acpi_pci_link.c ============================================================================== --- head/sys/dev/acpica/acpi_pci_link.c Tue Sep 1 21:32:25 2020 (r365095) +++ head/sys/dev/acpica/acpi_pci_link.c Tue Sep 1 21:32:41 2020 (r365096) @@ -157,7 +157,7 @@ acpi_pci_link_probe(device_t dev) rv = ACPI_ID_PROBE(device_get_parent(dev), dev, pci_link_ids, NULL); if (rv > 0) return (rv); - + if (ACPI_SUCCESS(acpi_short_name(acpi_get_handle(dev), name, sizeof(name)))) { snprintf(descr, sizeof(descr), "ACPI PCI Link %s", name); @@ -811,11 +811,9 @@ acpi_pci_link_srs_from_links(struct acpi_pci_link_soft srsbuf->Pointer = NULL; link = sc->pl_links; for (i = 0; i < sc->pl_num_links; i++) { - /* Add a new IRQ resource from each link. */ link = &sc->pl_links[i]; if (link->l_prs_template.Type == ACPI_RESOURCE_TYPE_IRQ) { - /* Build an IRQ resource. */ bcopy(&link->l_prs_template, &newres, ACPI_RS_SIZE(newres.Data.Irq)); @@ -828,7 +826,6 @@ acpi_pci_link_srs_from_links(struct acpi_pci_link_soft } else newres.Data.Irq.Interrupts[0] = 0; } else { - /* Build an ExtIRQ resuorce. */ bcopy(&link->l_prs_template, &newres, ACPI_RS_SIZE(newres.Data.ExtendedIrq)); Modified: head/sys/dev/acpica/acpi_powerres.c ============================================================================== --- head/sys/dev/acpica/acpi_powerres.c Tue Sep 1 21:32:25 2020 (r365095) +++ head/sys/dev/acpica/acpi_powerres.c Tue Sep 1 21:32:41 2020 (r365096) @@ -659,7 +659,6 @@ acpi_pwr_switch_power(void) /* Sweep the list backwards turning things off. */ TAILQ_FOREACH_REVERSE(rp, &acpi_powerresources, acpi_powerresource_list, ap_link) { - if (TAILQ_FIRST(&rp->ap_references) != NULL) { ACPI_DEBUG_PRINT((ACPI_DB_OBJECTS, "%s has references, not turning off\n", Modified: head/sys/dev/acpica/acpi_smbus.h ============================================================================== --- head/sys/dev/acpica/acpi_smbus.h Tue Sep 1 21:32:25 2020 (r365095) +++ head/sys/dev/acpica/acpi_smbus.h Tue Sep 1 21:32:41 2020 (r365096) @@ -49,7 +49,6 @@ /* Base address */ #define SMBATT_ADDRESS 0x16 - /* access: READ WRITE WORD */ #define SMBATT_CMD_MANUFACTURER_ACCESS 0 Modified: head/sys/dev/acpica/acpi_thermal.c ============================================================================== --- head/sys/dev/acpica/acpi_thermal.c Tue Sep 1 21:32:25 2020 (r365095) +++ head/sys/dev/acpica/acpi_thermal.c Tue Sep 1 21:32:41 2020 (r365096) @@ -530,7 +530,6 @@ acpi_tz_monitor(void *Context) if (acpi_tz_min_runtime > 0 && sc->tz_active != TZ_ACTIVE_NONE && sc->tz_active != TZ_ACTIVE_UNKNOWN && (newactive == TZ_ACTIVE_NONE || newactive > sc->tz_active)) { - getnanotime(&curtime); timespecsub(&curtime, &sc->tz_cooling_started, &curtime); if (curtime.tv_sec < acpi_tz_min_runtime) @@ -926,7 +925,6 @@ acpi_tz_power_profile(void *arg) /* check that we haven't decided there's no _SCP method */ if ((sc->tz_flags & TZ_FLAG_NO_SCP) == 0) { - /* Call _SCP to set the new profile */ status = acpi_SetInteger(sc->tz_handle, "_SCP", (state == POWER_PROFILE_PERFORMANCE) ? 0 : 1); Modified: head/sys/dev/acpica/acpi_timer.c ============================================================================== --- head/sys/dev/acpica/acpi_timer.c Tue Sep 1 21:32:25 2020 (r365095) +++ head/sys/dev/acpica/acpi_timer.c Tue Sep 1 21:32:41 2020 (r365096) @@ -354,7 +354,7 @@ acpi_timer_sysctl_freq(SYSCTL_HANDLER_ARGS) { int error; u_int freq; - + if (acpi_timer_timecounter.tc_frequency == 0) return (EOPNOTSUPP); freq = acpi_timer_frequency; @@ -366,7 +366,7 @@ acpi_timer_sysctl_freq(SYSCTL_HANDLER_ARGS) return (error); } - + SYSCTL_PROC(_machdep, OID_AUTO, acpi_timer_freq, CTLTYPE_INT | CTLFLAG_RW | CTLFLAG_NEEDGIANT, 0, sizeof(u_int), acpi_timer_sysctl_freq, "I", Modified: head/sys/dev/acpica/acpivar.h ============================================================================== --- head/sys/dev/acpica/acpivar.h Tue Sep 1 21:32:25 2020 (r365095) +++ head/sys/dev/acpica/acpivar.h Tue Sep 1 21:32:41 2020 (r365096) @@ -377,7 +377,6 @@ int acpi_MatchHid(ACPI_HANDLE h, const char *hid); #define ACPI_MATCHHID_HID 1 #define ACPI_MATCHHID_CID 2 - struct acpi_parse_resource_set { void (*set_init)(device_t dev, void *arg, void **context); void (*set_done)(device_t dev, void *context);
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202009012132.081LWglh031628>