Sat Apr 27 00:40:07 2024 UTC (13d)

Remove 0 initializations (since the softc is zalloc'ed) and the initial
refresh which will have no data.


(christos)

diff -r1.122 -r1.123 src/sys/dev/acpi/acpi_bat.c

--- src/sys/dev/acpi/acpi_bat.c 2024/04/26 18:19:18	1.122
+++ src/sys/dev/acpi/acpi_bat.c 2024/04/27 00:40:06	1.123

 @@ -1,14 +1,14 @@
-/*	$NetBSD: acpi_bat.c,v 1.122 2024/04/26 18:19:18 christos Exp $	*/
+/*	$NetBSD: acpi_bat.c,v 1.123 2024/04/27 00:40:06 christos Exp $	*/
 /*-
  * Copyright (c) 2003 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Charles M. Hannum of By Noon Software, Inc.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -65,27 +65,27 @@
 /*
  * ACPI Battery Driver.
+ *
  * ACPI defines two different battery device interfaces: "Control
  * Method" batteries, in which AML methods are defined in order to get
  * battery status and set battery alarm thresholds, and a "Smart
  * Battery" device, which is an SMbus device accessed through the ACPI
  * Embedded Controller device.
+ *
  * This driver is for the "Control Method"-style battery only.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: acpi_bat.c,v 1.122 2024/04/26 18:19:18 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: acpi_bat.c,v 1.123 2024/04/27 00:40:06 christos Exp $");
 #include <sys/param.h>
 #include <sys/condvar.h>
 #include <sys/device.h>
 #include <sys/kernel.h>
 #include <sys/kmem.h>
 #include <sys/module.h>
 #include <sys/mutex.h>
 #include <sys/systm.h>
 #include <dev/acpi/acpireg.h>
 #include <dev/acpi/acpivar.h>
 @@ -219,34 +219,26 @@ acpibat_match(device_t parent, cfdata_t
 static void
 acpibat_attach(device_t parent, device_t self, void *aux)
+{
 	struct acpibat_softc *sc = device_private(self);
 	struct acpi_attach_args *aa = aux;
 	ACPI_HANDLE tmp;
 	ACPI_STATUS rv;
 	aprint_naive(": ACPI Battery\n");
 	aprint_normal(": ACPI Battery\n");
 	sc->sc_node = aa->aa_node;
 	sc->sc_present = 0;
 	sc->sc_dvoltage = 0;
 	sc->sc_dcapacity = 0;
 	sc->sc_lcapacity = 0;
 	sc->sc_wcapacity = 0;
 	sc->sc_sme = NULL;
 	mutex_init(&sc->sc_mutex, MUTEX_DEFAULT, IPL_NONE);
 	cv_init(&sc->sc_condvar, device_xname(self));
 	sc->sc_sensor = kmem_zalloc(ACPIBAT_COUNT *
 	    sizeof(*sc->sc_sensor), KM_SLEEP);
 	config_interrupts(self, acpibat_init_envsys);
 	/*
 	 * If this is ever seen, the driver should be extended.
 	 */
 	rv = AcpiGetHandle(sc->sc_node->ad_handle, "_BIX", &tmp);
 	if (ACPI_SUCCESS(rv))
 @@ -749,27 +741,27 @@ acpibat_init_envsys(device_t dv)
 	sc->sc_sme = sysmon_envsys_create();
 	for (i = 0; i < ACPIBAT_COUNT; i++) {
 		if (sysmon_envsys_sensor_attach(sc->sc_sme,
 			&sc->sc_sensor[i]))
 			goto fail;
+	}
 	sc->sc_sme->sme_name = device_xname(dv);
 	sc->sc_sme->sme_cookie = dv;
 	sc->sc_sme->sme_refresh = acpibat_refresh;
 	sc->sc_sme->sme_class = SME_CLASS_BATTERY;
-	sc->sc_sme->sme_flags = SME_POLL_ONLY | SME_INIT_REFRESH;
+	sc->sc_sme->sme_flags = SME_POLL_ONLY;
 	sc->sc_sme->sme_get_limits = acpibat_get_limits;
 	if (sysmon_envsys_register(sc->sc_sme))
 		goto fail;
 	(void)acpi_register_notify(sc->sc_node, acpibat_notify_handler);
 	acpibat_update_info(dv);
 	acpibat_update_status(dv);
 	(void)pmf_device_register(dv, NULL, acpibat_resume);
 	return;
 fail: