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>

diff --git a/drivers/gpu/drm/nouveau/include/nvkm/subdev/timer.h b/drivers/gpu/drm/nouveau/include/nvkm/subdev/timer.h
index 820a4805916f1da8115b798cf3c93d5750ae8196..ff0709652f802957ae32e8f8efdc3780694a8461 100644 (file)
--- a/drivers/gpu/drm/nouveau/include/nvkm/subdev/timer.h
+++ b/drivers/gpu/drm/nouveau/include/nvkm/subdev/timer.h
@@ -26,7 +26,6 @@ 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_cancel(struct nvkm_timer *, struct nvkm_alarm *);
 
 /* Delay based on GPU time (ie. PTIMER).
  *

diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/pmu/gk20a.c b/drivers/gpu/drm/nouveau/nvkm/subdev/pmu/gk20a.c
index 9ca0db796cbe4fe581d0b88b6f7a71c1a5434483..978aae3c10017510010600e7ef701ca3605beafc 100644 (file)
--- a/drivers/gpu/drm/nouveau/nvkm/subdev/pmu/gk20a.c
+++ b/drivers/gpu/drm/nouveau/nvkm/subdev/pmu/gk20a.c
@@ -158,7 +158,7 @@ static void
 gk20a_pmu_fini(struct nvkm_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);
 }

diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/therm/base.c b/drivers/gpu/drm/nouveau/nvkm/subdev/therm/base.c
index be691a7b972f38362009a39b5ff50d029531ba05..952a7cb0a59a091397d91e53960f8fc0e6aa26a3 100644 (file)
--- a/drivers/gpu/drm/nouveau/nvkm/subdev/therm/base.c
+++ b/drivers/gpu/drm/nouveau/nvkm/subdev/therm/base.c
@@ -116,7 +116,7 @@ nvkm_therm_update(struct nvkm_therm *therm, int mode)
 
        switch (mode) {
        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);
                if (duty < 0)
                        duty = 100;
@@ -142,7 +142,7 @@ nvkm_therm_update(struct nvkm_therm *therm, int mode)
                break;
        case NVKM_THERM_CTRL_NONE:
        default:
-               nvkm_timer_alarm_cancel(tmr, &therm->alarm);
+               nvkm_timer_alarm(tmr, 0, &therm->alarm);
                poll = false;
        }
 

diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/therm/fan.c b/drivers/gpu/drm/nouveau/nvkm/subdev/therm/fan.c
index e2feccec25f59a9717131f7eeb31b827415ff3c7..f8fa43c8a7d246920961d159a00b924a8dad23e2 100644 (file)
--- a/drivers/gpu/drm/nouveau/nvkm/subdev/therm/fan.c
+++ b/drivers/gpu/drm/nouveau/nvkm/subdev/therm/fan.c
@@ -215,7 +215,7 @@ nvkm_therm_fan_fini(struct nvkm_therm *therm, bool suspend)
 {
        struct nvkm_timer *tmr = therm->subdev.device->timer;
        if (suspend)
-               nvkm_timer_alarm_cancel(tmr, &therm->fan->alarm);
+               nvkm_timer_alarm(tmr, 0, &therm->fan->alarm);
        return 0;
 }
 

diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/therm/temp.c b/drivers/gpu/drm/nouveau/nvkm/subdev/therm/temp.c
index 9a79e91fdfdc6dda7812455144044da8cc2d64f4..e93b2410c38b835a7b19f7b301c51497788048dc 100644 (file)
--- 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;
 }
 

diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/timer/base.c b/drivers/gpu/drm/nouveau/nvkm/subdev/timer/base.c
index 2437f7d41ca20de616a7193f2d6fdec6d7daea00..36de23d12ae460e336d1f4917434881afe26a5a5 100644 (file)
--- a/drivers/gpu/drm/nouveau/nvkm/subdev/timer/base.c
+++ b/drivers/gpu/drm/nouveau/nvkm/subdev/timer/base.c
@@ -105,15 +105,6 @@ nvkm_timer_alarm(struct nvkm_timer *tmr, u32 nsec, struct nvkm_alarm *alarm)
        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
 nvkm_timer_intr(struct nvkm_subdev *subdev)
 {