diff options
| author | Ben Skeggs <bskeggs@redhat.com> | 2015-08-20 14:54:20 +1000 |
|---|---|---|
| committer | Ben Skeggs <bskeggs@redhat.com> | 2015-08-28 12:40:42 +1000 |
| commit | 46484438ab7dbab6ed29cf647d029e0b1ef3d9d8 (patch) | |
| tree | 1cc48e32231c7e8fbeb1cc97e0da9c55ef94102c /drivers/gpu/drm/nouveau/nvkm/subdev/therm | |
| parent | 3293228174e4d44cca56d809cc8409c3f88f8b90 (diff) | |
| download | linux-46484438ab7dbab6ed29cf647d029e0b1ef3d9d8.tar.gz linux-46484438ab7dbab6ed29cf647d029e0b1ef3d9d8.tar.bz2 linux-46484438ab7dbab6ed29cf647d029e0b1ef3d9d8.zip | |
drm/nouveau/bios: convert to new-style nvkm_subdev
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/nouveau/nvkm/subdev/therm')
| -rw-r--r-- | drivers/gpu/drm/nouveau/nvkm/subdev/therm/fanpwm.c | 4 | ||||
| -rw-r--r-- | drivers/gpu/drm/nouveau/nvkm/subdev/therm/temp.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/therm/fanpwm.c b/drivers/gpu/drm/nouveau/nvkm/subdev/therm/fanpwm.c index 97917c532e14..ac4847f2912d 100644 --- a/drivers/gpu/drm/nouveau/nvkm/subdev/therm/fanpwm.c +++ b/drivers/gpu/drm/nouveau/nvkm/subdev/therm/fanpwm.c @@ -87,8 +87,8 @@ int nvkm_fanpwm_create(struct nvkm_therm *obj, struct dcb_gpio_func *func) { struct nvkm_therm_priv *therm = container_of(obj, typeof(*therm), base); - struct nvkm_device *device = nv_device(therm); - struct nvkm_bios *bios = nvkm_bios(therm); + struct nvkm_device *device = therm->base.subdev.device; + struct nvkm_bios *bios = device->bios; struct nvkm_fanpwm *fan; struct nvbios_therm_fan info; u32 divs, duty; diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/therm/temp.c b/drivers/gpu/drm/nouveau/nvkm/subdev/therm/temp.c index b346f3a0ff11..2622c4403a73 100644 --- a/drivers/gpu/drm/nouveau/nvkm/subdev/therm/temp.c +++ b/drivers/gpu/drm/nouveau/nvkm/subdev/therm/temp.c @@ -251,7 +251,7 @@ nvkm_therm_sensor_ctor(struct nvkm_therm *obj) { struct nvkm_therm_priv *therm = container_of(obj, typeof(*therm), base); struct nvkm_subdev *subdev = &therm->base.subdev; - struct nvkm_bios *bios = nvkm_bios(therm); + struct nvkm_bios *bios = subdev->device->bios; nvkm_alarm_init(&therm->sensor.therm_poll_alarm, alarm_timer_callback); |