diff options
| author | Ben Skeggs <bskeggs@redhat.com> | 2017-05-11 09:29:58 +0200 |
|---|---|---|
| committer | Ben Skeggs <bskeggs@redhat.com> | 2017-06-16 06:04:42 +0200 |
| commit | 7eaf1198a9aaa9c31c9270e370088d8a79c149ab (patch) | |
| tree | e24f075e88281c919a6d1c8d034b10a4123fae2d /drivers/gpu/drm/nouveau/nvkm/subdev/therm/temp.c | |
| parent | drm/nouveau/bios/iccsense: rails for power sensors have a mask of 0xf8 for ve... (diff) | |
| download | linux-7eaf1198a9aaa9c31c9270e370088d8a79c149ab.tar.xz linux-7eaf1198a9aaa9c31c9270e370088d8a79c149ab.zip | |
drm/nouveau/tmr: remove nvkm_timer_alarm_cancel()
nvkm_timer_alarm() already handles this as part of protecting against
callers passing in no timeout value.
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/nouveau/nvkm/subdev/therm/temp.c')
| -rw-r--r-- | drivers/gpu/drm/nouveau/nvkm/subdev/therm/temp.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/therm/temp.c b/drivers/gpu/drm/nouveau/nvkm/subdev/therm/temp.c index 9a79e91fdfdc..e93b2410c38b 100644 --- a/drivers/gpu/drm/nouveau/nvkm/subdev/therm/temp.c +++ b/drivers/gpu/drm/nouveau/nvkm/subdev/therm/temp.c @@ -220,7 +220,7 @@ nvkm_therm_sensor_fini(struct nvkm_therm *therm, bool suspend) { struct nvkm_timer *tmr = therm->subdev.device->timer; if (suspend) - nvkm_timer_alarm_cancel(tmr, &therm->sensor.therm_poll_alarm); + nvkm_timer_alarm(tmr, 0, &therm->sensor.therm_poll_alarm); return 0; } |