Commit 7eaf1198 authored by Ben Skeggs's avatar Ben Skeggs

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: default avatarBen Skeggs <bskeggs@redhat.com>
parent 4dc33b12
...@@ -26,7 +26,6 @@ struct nvkm_timer { ...@@ -26,7 +26,6 @@ struct nvkm_timer {
u64 nvkm_timer_read(struct nvkm_timer *); u64 nvkm_timer_read(struct nvkm_timer *);
void nvkm_timer_alarm(struct nvkm_timer *, u32 nsec, struct nvkm_alarm *); void nvkm_timer_alarm(struct nvkm_timer *, u32 nsec, struct nvkm_alarm *);
void nvkm_timer_alarm_cancel(struct nvkm_timer *, struct nvkm_alarm *);
/* Delay based on GPU time (ie. PTIMER). /* Delay based on GPU time (ie. PTIMER).
* *
......
...@@ -158,7 +158,7 @@ static void ...@@ -158,7 +158,7 @@ static void
gk20a_pmu_fini(struct nvkm_pmu *pmu) gk20a_pmu_fini(struct nvkm_pmu *pmu)
{ {
struct gk20a_pmu *gpmu = gk20a_pmu(pmu); struct gk20a_pmu *gpmu = gk20a_pmu(pmu);
nvkm_timer_alarm_cancel(pmu->subdev.device->timer, &gpmu->alarm); nvkm_timer_alarm(pmu->subdev.device->timer, 0, &gpmu->alarm);
nvkm_falcon_put(pmu->falcon, &pmu->subdev); nvkm_falcon_put(pmu->falcon, &pmu->subdev);
} }
......
...@@ -116,7 +116,7 @@ nvkm_therm_update(struct nvkm_therm *therm, int mode) ...@@ -116,7 +116,7 @@ nvkm_therm_update(struct nvkm_therm *therm, int mode)
switch (mode) { switch (mode) {
case NVKM_THERM_CTRL_MANUAL: case NVKM_THERM_CTRL_MANUAL:
nvkm_timer_alarm_cancel(tmr, &therm->alarm); nvkm_timer_alarm(tmr, 0, &therm->alarm);
duty = nvkm_therm_fan_get(therm); duty = nvkm_therm_fan_get(therm);
if (duty < 0) if (duty < 0)
duty = 100; duty = 100;
...@@ -142,7 +142,7 @@ nvkm_therm_update(struct nvkm_therm *therm, int mode) ...@@ -142,7 +142,7 @@ nvkm_therm_update(struct nvkm_therm *therm, int mode)
break; break;
case NVKM_THERM_CTRL_NONE: case NVKM_THERM_CTRL_NONE:
default: default:
nvkm_timer_alarm_cancel(tmr, &therm->alarm); nvkm_timer_alarm(tmr, 0, &therm->alarm);
poll = false; poll = false;
} }
......
...@@ -215,7 +215,7 @@ nvkm_therm_fan_fini(struct nvkm_therm *therm, bool suspend) ...@@ -215,7 +215,7 @@ nvkm_therm_fan_fini(struct nvkm_therm *therm, bool suspend)
{ {
struct nvkm_timer *tmr = therm->subdev.device->timer; struct nvkm_timer *tmr = therm->subdev.device->timer;
if (suspend) if (suspend)
nvkm_timer_alarm_cancel(tmr, &therm->fan->alarm); nvkm_timer_alarm(tmr, 0, &therm->fan->alarm);
return 0; return 0;
} }
......
...@@ -220,7 +220,7 @@ nvkm_therm_sensor_fini(struct nvkm_therm *therm, bool suspend) ...@@ -220,7 +220,7 @@ nvkm_therm_sensor_fini(struct nvkm_therm *therm, bool suspend)
{ {
struct nvkm_timer *tmr = therm->subdev.device->timer; struct nvkm_timer *tmr = therm->subdev.device->timer;
if (suspend) if (suspend)
nvkm_timer_alarm_cancel(tmr, &therm->sensor.therm_poll_alarm); nvkm_timer_alarm(tmr, 0, &therm->sensor.therm_poll_alarm);
return 0; return 0;
} }
......
...@@ -105,15 +105,6 @@ nvkm_timer_alarm(struct nvkm_timer *tmr, u32 nsec, struct nvkm_alarm *alarm) ...@@ -105,15 +105,6 @@ nvkm_timer_alarm(struct nvkm_timer *tmr, u32 nsec, struct nvkm_alarm *alarm)
spin_unlock_irqrestore(&tmr->lock, flags); spin_unlock_irqrestore(&tmr->lock, flags);
} }
void
nvkm_timer_alarm_cancel(struct nvkm_timer *tmr, struct nvkm_alarm *alarm)
{
unsigned long flags;
spin_lock_irqsave(&tmr->lock, flags);
list_del_init(&alarm->head);
spin_unlock_irqrestore(&tmr->lock, flags);
}
static void static void
nvkm_timer_intr(struct nvkm_subdev *subdev) nvkm_timer_intr(struct nvkm_subdev *subdev)
{ {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment