projects
/
deliverable
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'sunxi-drm-fixes-for-4.7' of https://git.kernel.org/pub/scm/linux/kernel...
[deliverable/linux.git]
/
drivers
/
gpu
/
drm
/
nouveau
/
nvkm
/
subdev
/
iccsense
/
base.c
diff --git
a/drivers/gpu/drm/nouveau/nvkm/subdev/iccsense/base.c
b/drivers/gpu/drm/nouveau/nvkm/subdev/iccsense/base.c
index 323c79abe46855f45ec5e91a722324f93d183a8a..41bd5d0f76927e1e2f38ffe7e1d3c228a4d05139 100644
(file)
--- a/
drivers/gpu/drm/nouveau/nvkm/subdev/iccsense/base.c
+++ b/
drivers/gpu/drm/nouveau/nvkm/subdev/iccsense/base.c
@@
-276,6
+276,8
@@
nvkm_iccsense_oneinit(struct nvkm_subdev *subdev)
struct pwr_rail_t *r = &stbl.rail[i];
struct nvkm_iccsense_rail *rail;
struct nvkm_iccsense_sensor *sensor;
struct pwr_rail_t *r = &stbl.rail[i];
struct nvkm_iccsense_rail *rail;
struct nvkm_iccsense_sensor *sensor;
+ int (*read)(struct nvkm_iccsense *,
+ struct nvkm_iccsense_rail *);
if (!r->mode || r->resistor_mohm == 0)
continue;
if (!r->mode || r->resistor_mohm == 0)
continue;
@@
-284,31
+286,31
@@
nvkm_iccsense_oneinit(struct nvkm_subdev *subdev)
if (!sensor)
continue;
if (!sensor)
continue;
- rail = kmalloc(sizeof(*rail), GFP_KERNEL);
- if (!rail)
- return -ENOMEM;
-
switch (sensor->type) {
case NVBIOS_EXTDEV_INA209:
if (r->rail != 0)
continue;
switch (sensor->type) {
case NVBIOS_EXTDEV_INA209:
if (r->rail != 0)
continue;
- r
ail->r
ead = nvkm_iccsense_ina209_read;
+ read = nvkm_iccsense_ina209_read;
break;
case NVBIOS_EXTDEV_INA219:
if (r->rail != 0)
continue;
break;
case NVBIOS_EXTDEV_INA219:
if (r->rail != 0)
continue;
- r
ail->r
ead = nvkm_iccsense_ina219_read;
+ read = nvkm_iccsense_ina219_read;
break;
case NVBIOS_EXTDEV_INA3221:
if (r->rail >= 3)
continue;
break;
case NVBIOS_EXTDEV_INA3221:
if (r->rail >= 3)
continue;
- r
ail->r
ead = nvkm_iccsense_ina3221_read;
+ read = nvkm_iccsense_ina3221_read;
break;
default:
continue;
}
break;
default:
continue;
}
+ rail = kmalloc(sizeof(*rail), GFP_KERNEL);
+ if (!rail)
+ return -ENOMEM;
sensor->rail_mask |= 1 << r->rail;
sensor->rail_mask |= 1 << r->rail;
+ rail->read = read;
rail->sensor = sensor;
rail->idx = r->rail;
rail->mohm = r->resistor_mohm;
rail->sensor = sensor;
rail->idx = r->rail;
rail->mohm = r->resistor_mohm;
This page took
0.028435 seconds
and
5
git commands to generate.