Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/dev/acpi Remove retrieving the zone name via something c...



details:   https://anonhg.NetBSD.org/src/rev/d20107d166b7
branches:  trunk
changeset: 754241:d20107d166b7
user:      jruoho <jruoho%NetBSD.org@localhost>
date:      Sat Apr 24 19:16:10 2010 +0000

description:
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:

 sys/dev/acpi/acpi_tz.c |  15 ++++-----------
 1 files changed, 4 insertions(+), 11 deletions(-)

diffs (50 lines):

diff -r 4f873c25a81a -r d20107d166b7 sys/dev/acpi/acpi_tz.c
--- a/sys/dev/acpi/acpi_tz.c    Sat Apr 24 19:11:48 2010 +0000
+++ b/sys/dev/acpi/acpi_tz.c    Sat Apr 24 19:16:10 2010 +0000
@@ -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@localhost>
@@ -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 @@
 #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 @@
                &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 @@
        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;



Home | Main Index | Thread Index | Old Index