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:43 +1000 |
| commit | c5fcafa528463b207108cd606e0d41741fb7dc50 (patch) | |
| tree | 0211a957a7d0db373d2e3b00df0e40d0b7a1388f /drivers/gpu/drm/nouveau/nvkm/subdev/therm | |
| parent | 03c8952fb36b58e451b8a93a1a2abd59e09ddf7b (diff) | |
| download | linux-c5fcafa528463b207108cd606e0d41741fb7dc50.tar.bz2 | |
drm/nouveau/fuse: 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/g84.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/therm/g84.c b/drivers/gpu/drm/nouveau/nvkm/subdev/therm/g84.c index aea79d7201bd..c70b79f8786c 100644 --- a/drivers/gpu/drm/nouveau/nvkm/subdev/therm/g84.c +++ b/drivers/gpu/drm/nouveau/nvkm/subdev/therm/g84.c @@ -30,9 +30,8 @@ int g84_temp_get(struct nvkm_therm *therm) { struct nvkm_device *device = therm->subdev.device; - struct nvkm_fuse *fuse = nvkm_fuse(therm); - if (fuse->func->read(fuse, 0x1a8) == 1) + if (nvkm_fuse_read(device->fuse, 0x1a8) == 1) return nvkm_rd32(device, 0x20400); else return -ENODEV; @@ -42,10 +41,9 @@ void g84_sensor_setup(struct nvkm_therm *therm) { struct nvkm_device *device = therm->subdev.device; - struct nvkm_fuse *fuse = nvkm_fuse(therm); /* enable temperature reading for cards with insane defaults */ - if (fuse->func->read(fuse, 0x1a8) == 1) { + if (nvkm_fuse_read(device->fuse, 0x1a8) == 1) { nvkm_mask(device, 0x20008, 0x80008000, 0x80000000); nvkm_mask(device, 0x2000c, 0x80000003, 0x00000000); mdelay(20); /* wait for the temperature to stabilize */ |