drm/nouveau/therm: kill some over-zealous debugging

Signed-off-by: Ben Skeggs <bskeggs@redhat.com>

diff --git a/drivers/gpu/drm/nouveau/core/subdev/therm/base.c b/drivers/gpu/drm/nouveau/core/subdev/therm/base.c
index f1de7a9c572be624d607d450081499a447d919ca..d2f10ad047a86f87e44f831d741415df0ea5155f 100644 (file)
--- a/drivers/gpu/drm/nouveau/core/subdev/therm/base.c
+++ b/drivers/gpu/drm/nouveau/core/subdev/therm/base.c
@@ -95,7 +95,6 @@ nouveau_therm_update(struct nouveau_therm *therm, int mode)
        int duty;
 
        spin_lock_irqsave(&priv->lock, flags);
-       nv_debug(therm, "FAN speed check\n");
        if (mode < 0)
                mode = priv->mode;
        priv->mode = mode;
@@ -125,8 +124,6 @@ nouveau_therm_update(struct nouveau_therm *therm, int mode)
 done:
        if (list_empty(&priv->alarm.head) && (mode == NOUVEAU_THERM_CTRL_AUTO))
                ptimer->alarm(ptimer, 1000000000ULL, &priv->alarm);
-       else if (!list_empty(&priv->alarm.head))
-               nv_debug(therm, "therm fan alarm list is not empty\n");
        spin_unlock_irqrestore(&priv->lock, flags);
 }
 

diff --git a/drivers/gpu/drm/nouveau/core/subdev/therm/temp.c b/drivers/gpu/drm/nouveau/core/subdev/therm/temp.c
index b80a33011b9313f8ac4e771cb93aaaf7e163d889..cfde9eb44ad0142309970f2eac404c8c5b368c69 100644 (file)
--- a/drivers/gpu/drm/nouveau/core/subdev/therm/temp.c
+++ b/drivers/gpu/drm/nouveau/core/subdev/therm/temp.c
@@ -180,8 +180,6 @@ alarm_timer_callback(struct nouveau_alarm *alarm)
 
        spin_lock_irqsave(&priv->sensor.alarm_program_lock, flags);
 
-       nv_debug(therm, "polling the internal temperature\n");
-
        nouveau_therm_threshold_hyst_polling(therm, &sensor->thrs_fan_boost,
                                             NOUVEAU_THERM_THRS_FANBOOST);
 

diff --git a/drivers/gpu/drm/nouveau/core/subdev/timer/nv04.c b/drivers/gpu/drm/nouveau/core/subdev/timer/nv04.c
index 57711ecb566c2c7b88c7a7915f6efe56b6b924fd..c0bdd10358d76b748d4fc22e3ac480c99760cadd 100644 (file)
--- a/drivers/gpu/drm/nouveau/core/subdev/timer/nv04.c
+++ b/drivers/gpu/drm/nouveau/core/subdev/timer/nv04.c
@@ -119,16 +119,8 @@ nv04_timer_alarm_cancel(struct nouveau_timer *ptimer,
 {
        struct nv04_timer_priv *priv = (void *)ptimer;
        unsigned long flags;
-
-       /* avoid deleting an entry while the alarm intr is running */
        spin_lock_irqsave(&priv->lock, flags);
-
-       /* delete the alarm from the list */
-       list_del(&alarm->head);
-
-       /* reset the head so as list_empty returns 1 */
-       INIT_LIST_HEAD(&alarm->head);
-
+       list_del_init(&alarm->head);
        spin_unlock_irqrestore(&priv->lock, flags);
 }