Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

There's no need to set the "envsys-description" property in the 

driver's dictionary anymore, because with envsys2 you can change
descriptions.
This commit is contained in:
xtraeme 2007-07-04 19:00:43 +00:00
parent 1492e24783
commit 60ed581de9
2 changed files with 3 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
sys/dev/i2c/lm75.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: lm75.c,v 1.12 2007/07/01 07:37:16 xtraeme Exp $ */
/* $NetBSD: lm75.c,v 1.13 2007/07/04 19:00:43 xtraeme Exp $ */
/*
* Copyright (c) 2003 Wasabi Systems, Inc.
@ -116,7 +116,6 @@ lmtemp_attach(struct device *parent, struct device *self, void *aux)
{
struct lmtemp_softc *sc = device_private(self);
struct i2c_attach_args *ia = aux;
prop_string_t desc;
int i;
for (i = 0; lmtemptbl[i].lmtemp_type != -1 ; i++)
@ -144,14 +143,6 @@ lmtemp_attach(struct device *parent, struct device *self, void *aux)
sc->sc_sensor[0].sensor = 0;
sc->sc_sensor[0].state = ENVSYS_FVALID;
sc->sc_sensor[0].units = ENVSYS_STEMP;
desc = prop_dictionary_get(device_properties(&sc->sc_dev),
"envsys-description");
if (desc != NULL &&
prop_object_type(desc) == PROP_TYPE_STRING &&
prop_string_size(desc) > 0)
strcpy(sc->sc_sensor[0].desc, prop_string_cstring_nocopy(desc));
else
strcpy(sc->sc_sensor[0].desc, sc->sc_dev.dv_xname);
sc->sc_lmtemp_decode = lmtemptbl[i].lmtemp_decode;

26
sys/dev/onewire/owtemp.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: owtemp.c,v 1.7 2007/07/01 07:37:21 xtraeme Exp $ */
/* $NetBSD: owtemp.c,v 1.8 2007/07/04 19:00:44 xtraeme Exp $ */
/* $OpenBSD: owtemp.c,v 1.1 2006/03/04 16:27:03 grange Exp $ */
/*
@ -22,7 +22,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: owtemp.c,v 1.7 2007/07/01 07:37:21 xtraeme Exp $");
__KERNEL_RCSID(0, "$NetBSD: owtemp.c,v 1.8 2007/07/04 19:00:44 xtraeme Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -88,7 +88,6 @@ owtemp_attach(struct device *parent, struct device *self, void *aux)
{
struct owtemp_softc *sc = device_private(self);
struct onewire_attach_args *oa = aux;
prop_string_t desc;
sc->sc_onewire = oa->oa_onewire;
sc->sc_rom = oa->oa_rom;
@ -107,14 +106,6 @@ owtemp_attach(struct device *parent, struct device *self, void *aux)
sc->sc_sensor[0].sensor = 0;
sc->sc_sensor[0].state = ENVSYS_SVALID;
sc->sc_sensor[0].units = ENVSYS_STEMP;
desc = prop_dictionary_get(device_properties(&sc->sc_dev),
"envsys-description");
if (desc != NULL &&
prop_object_type(desc) == PROP_TYPE_STRING &&
prop_string_size(desc) > 0)
strcpy(sc->sc_sensor[0].desc, prop_string_cstring_nocopy(desc));
else
strcpy(sc->sc_sensor[0].desc, sc->sc_dev.dv_xname);
/* Hook into system monitor. */
sc->sc_sysmon.sme_name = sc->sc_dev.dv_xname;
@ -127,19 +118,6 @@ owtemp_attach(struct device *parent, struct device *self, void *aux)
aprint_error("%s: unable to register with sysmon\n",
sc->sc_dev.dv_xname);
#if 0 /* Old OpenBSD code */
strlcpy(sc->sc_sensor.device, sc->sc_dev.dv_xname,
sizeof(sc->sc_sensor.device));
sc->sc_sensor.type = SENSOR_TEMP;
strlcpy(sc->sc_sensor.desc, "Temp", sizeof(sc->sc_sensor.desc));
if (sensor_task_register(sc, owtemp_update, 5)) {
printf(": unable to register update task\n");
return;
}
sensor_add(&sc->sc_sensor);
#endif
printf("\n");
}