diff options
| author | Dan McDonald <danmcd@joyent.com> | 2020-09-22 10:39:49 -0400 |
|---|---|---|
| committer | Dan McDonald <danmcd@joyent.com> | 2020-09-22 10:39:49 -0400 |
| commit | 267e12a7d9bf6e5fcefb9cc00f46bfff0dc5226e (patch) | |
| tree | 19a3941920d0039c35d53a5cbee189b5ca51995a /usr/src/uts/intel/io/amdnbtemp/amdnbtemp.c | |
| parent | 517abc5c668925e6092495bf332233c3599980d2 (diff) | |
| parent | e9faba760cdf80d7dfa110fe0830917ab94668c2 (diff) | |
| download | illumos-joyent-vpc.tar.gz | |
Merge branch 'master' into vpcvpc
Diffstat (limited to 'usr/src/uts/intel/io/amdnbtemp/amdnbtemp.c')
| -rw-r--r-- | usr/src/uts/intel/io/amdnbtemp/amdnbtemp.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/usr/src/uts/intel/io/amdnbtemp/amdnbtemp.c b/usr/src/uts/intel/io/amdnbtemp/amdnbtemp.c index 1330f8563f..17934520fd 100644 --- a/usr/src/uts/intel/io/amdnbtemp/amdnbtemp.c +++ b/usr/src/uts/intel/io/amdnbtemp/amdnbtemp.c @@ -103,7 +103,7 @@ typedef struct amdnbtemp { static void *amdnbtemp_state; static int -amdnbtemp_read(void *arg, sensor_ioctl_temperature_t *temp) +amdnbtemp_read(void *arg, sensor_ioctl_scalar_t *scalar) { amdnbtemp_t *at = arg; @@ -120,9 +120,9 @@ amdnbtemp_read(void *arg, sensor_ioctl_temperature_t *temp) at->at_temp -= AMDNBTEMP_TEMP_ADJUST; } - temp->sit_unit = SENSOR_UNIT_CELSIUS; - temp->sit_gran = AMDNBTEMP_GRANULARITY; - temp->sit_temp = at->at_temp; + scalar->sis_unit = SENSOR_UNIT_CELSIUS; + scalar->sis_gran = AMDNBTEMP_GRANULARITY; + scalar->sis_value = at->at_temp; mutex_exit(&at->at_mutex); return (0); @@ -130,7 +130,7 @@ amdnbtemp_read(void *arg, sensor_ioctl_temperature_t *temp) static const ksensor_ops_t amdnbtemp_temp_ops = { .kso_kind = ksensor_kind_temperature, - .kso_temp = amdnbtemp_read + .kso_scalar = amdnbtemp_read }; static void |