summaryrefslogtreecommitdiff
path: root/sys/dev
diff options
context:
space:
mode:
authorjruoho <jruoho@NetBSD.org>2010-04-24 19:16:10 +0000
committerjruoho <jruoho@NetBSD.org>2010-04-24 19:16:10 +0000
commit80e5813055da760240894c564ae2dca0d40af6fd (patch)
treebe788c6c93aabaa4e9a008a233d06fabb62e9d7a /sys/dev
parentac93d6907ff73669705748a026144512adf2cc26 (diff)
Remove retrieving the zone name via something called "REGN".
We really should not add code that aims to satisfy some oddball firmware, not in the generic drivers that aim to comply with the specifications. In the long-term this is even worse than quirk tables.
Diffstat (limited to 'sys/dev')
-rw-r--r--sys/dev/acpi/acpi_tz.c15
1 files changed, 4 insertions, 11 deletions
diff --git a/sys/dev/acpi/acpi_tz.c b/sys/dev/acpi/acpi_tz.c
index b5b86068a43..dff0863531b 100644
--- a/sys/dev/acpi/acpi_tz.c
+++ b/sys/dev/acpi/acpi_tz.c
@@ -1,4 +1,4 @@
-/* $NetBSD: acpi_tz.c,v 1.69 2010/04/24 19:11:48 jruoho Exp $ */
+/* $NetBSD: acpi_tz.c,v 1.70 2010/04/24 19:16:10 jruoho Exp $ */
/*
* Copyright (c) 2003 Jared D. McNeill <jmcneill@invisible.ca>
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: acpi_tz.c,v 1.69 2010/04/24 19:11:48 jruoho Exp $");
+__KERNEL_RCSID(0, "$NetBSD: acpi_tz.c,v 1.70 2010/04/24 19:16:10 jruoho Exp $");
#include <sys/param.h>
#include <sys/device.h>
@@ -75,7 +75,6 @@ ACPI_MODULE_NAME ("acpi_tz")
#define ATZ2UKELVIN(t) ((t) * 100000 - 50000)
struct acpitz_zone {
- char *name;
ACPI_BUFFER al[ATZ_NLEVELS];
uint32_t ac[ATZ_NLEVELS];
uint32_t crt;
@@ -190,12 +189,6 @@ acpitz_attach(device_t parent, device_t self, void *aux)
&sc->sc_zone.fanmax, &sc->sc_zone.fancurrent) == 0)
sc->sc_have_fan = true;
- rv = acpi_eval_string(sc->sc_node->ad_handle,
- "REGN", &sc->sc_zone.name);
-
- if (ACPI_FAILURE(rv))
- sc->sc_zone.name = __UNCONST("temperature");
-
acpitz_get_zone(self, 1);
acpitz_get_status(self);
@@ -728,8 +721,8 @@ acpitz_init_envsys(device_t dv)
sc->sc_temp_sensor.flags = flags;
sc->sc_temp_sensor.units = ENVSYS_STEMP;
- (void)strlcpy(sc->sc_temp_sensor.desc,
- sc->sc_zone.name, sizeof(sc->sc_temp_sensor.desc));
+ (void)strlcpy(sc->sc_temp_sensor.desc, "temperature",
+ sizeof(sc->sc_temp_sensor.desc));
if (sysmon_envsys_sensor_attach(sc->sc_sme, &sc->sc_temp_sensor))
goto out;