These changes are the raw update to linux-4.4.6-rt14. Kernel sources

[kvmfornfv.git] / kernel / drivers / gpu / drm / nouveau / nvkm / subdev / therm / fantog.c

diff --git a/kernel/drivers/gpu/drm/nouveau/nvkm/subdev/therm/fantog.c b/kernel/drivers/gpu/drm/nouveau/nvkm/subdev/therm/fantog.c
index 4ce041e..59701b7 100644 (file)
--- a/kernel/drivers/gpu/drm/nouveau/nvkm/subdev/therm/fantog.c
+++ b/kernel/drivers/gpu/drm/nouveau/nvkm/subdev/therm/fantog.c
@@ -26,7 +26,7 @@
 #include <subdev/gpio.h>
 #include <subdev/timer.h>
 
-struct nvkm_fantog_priv {
+struct nvkm_fantog {
        struct nvkm_fan base;
        struct nvkm_alarm alarm;
        spinlock_t lock;
@@ -36,83 +36,81 @@ struct nvkm_fantog_priv {
 };
 
 static void
-nvkm_fantog_update(struct nvkm_fantog_priv *priv, int percent)
+nvkm_fantog_update(struct nvkm_fantog *fan, int percent)
 {
-       struct nvkm_therm_priv *tpriv = (void *)priv->base.parent;
-       struct nvkm_timer *ptimer = nvkm_timer(tpriv);
-       struct nvkm_gpio *gpio = nvkm_gpio(tpriv);
+       struct nvkm_therm *therm = fan->base.parent;
+       struct nvkm_device *device = therm->subdev.device;
+       struct nvkm_timer *tmr = device->timer;
+       struct nvkm_gpio *gpio = device->gpio;
        unsigned long flags;
        int duty;
 
-       spin_lock_irqsave(&priv->lock, flags);
+       spin_lock_irqsave(&fan->lock, flags);
        if (percent < 0)
-               percent = priv->percent;
-       priv->percent = percent;
+               percent = fan->percent;
+       fan->percent = percent;
 
-       duty = !gpio->get(gpio, 0, DCB_GPIO_FAN, 0xff);
-       gpio->set(gpio, 0, DCB_GPIO_FAN, 0xff, duty);
+       duty = !nvkm_gpio_get(gpio, 0, DCB_GPIO_FAN, 0xff);
+       nvkm_gpio_set(gpio, 0, DCB_GPIO_FAN, 0xff, duty);
 
-       if (list_empty(&priv->alarm.head) && percent != (duty * 100)) {
-               u64 next_change = (percent * priv->period_us) / 100;
+       if (list_empty(&fan->alarm.head) && percent != (duty * 100)) {
+               u64 next_change = (percent * fan->period_us) / 100;
                if (!duty)
-                       next_change = priv->period_us - next_change;
-               ptimer->alarm(ptimer, next_change * 1000, &priv->alarm);
+                       next_change = fan->period_us - next_change;
+               nvkm_timer_alarm(tmr, next_change * 1000, &fan->alarm);
        }
-       spin_unlock_irqrestore(&priv->lock, flags);
+       spin_unlock_irqrestore(&fan->lock, flags);
 }
 
 static void
 nvkm_fantog_alarm(struct nvkm_alarm *alarm)
 {
-       struct nvkm_fantog_priv *priv =
-              container_of(alarm, struct nvkm_fantog_priv, alarm);
-       nvkm_fantog_update(priv, -1);
+       struct nvkm_fantog *fan =
+              container_of(alarm, struct nvkm_fantog, alarm);
+       nvkm_fantog_update(fan, -1);
 }
 
 static int
 nvkm_fantog_get(struct nvkm_therm *therm)
 {
-       struct nvkm_therm_priv *tpriv = (void *)therm;
-       struct nvkm_fantog_priv *priv = (void *)tpriv->fan;
-       return priv->percent;
+       struct nvkm_fantog *fan = (void *)therm->fan;
+       return fan->percent;
 }
 
 static int
 nvkm_fantog_set(struct nvkm_therm *therm, int percent)
 {
-       struct nvkm_therm_priv *tpriv = (void *)therm;
-       struct nvkm_fantog_priv *priv = (void *)tpriv->fan;
-       if (therm->pwm_ctrl)
-               therm->pwm_ctrl(therm, priv->func.line, false);
-       nvkm_fantog_update(priv, percent);
+       struct nvkm_fantog *fan = (void *)therm->fan;
+       if (therm->func->pwm_ctrl)
+               therm->func->pwm_ctrl(therm, fan->func.line, false);
+       nvkm_fantog_update(fan, percent);
        return 0;
 }
 
 int
 nvkm_fantog_create(struct nvkm_therm *therm, struct dcb_gpio_func *func)
 {
-       struct nvkm_therm_priv *tpriv = (void *)therm;
-       struct nvkm_fantog_priv *priv;
+       struct nvkm_fantog *fan;
        int ret;
 
-       if (therm->pwm_ctrl) {
-               ret = therm->pwm_ctrl(therm, func->line, false);
+       if (therm->func->pwm_ctrl) {
+               ret = therm->func->pwm_ctrl(therm, func->line, false);
                if (ret)
                        return ret;
        }
 
-       priv = kzalloc(sizeof(*priv), GFP_KERNEL);
-       tpriv->fan = &priv->base;
-       if (!priv)
+       fan = kzalloc(sizeof(*fan), GFP_KERNEL);
+       therm->fan = &fan->base;
+       if (!fan)
                return -ENOMEM;
 
-       priv->base.type = "toggle";
-       priv->base.get = nvkm_fantog_get;
-       priv->base.set = nvkm_fantog_set;
-       nvkm_alarm_init(&priv->alarm, nvkm_fantog_alarm);
-       priv->period_us = 100000; /* 10Hz */
-       priv->percent = 100;
-       priv->func = *func;
-       spin_lock_init(&priv->lock);
+       fan->base.type = "toggle";
+       fan->base.get = nvkm_fantog_get;
+       fan->base.set = nvkm_fantog_set;
+       nvkm_alarm_init(&fan->alarm, nvkm_fantog_alarm);
+       fan->period_us = 100000; /* 10Hz */
+       fan->percent = 100;
+       fan->func = *func;
+       spin_lock_init(&fan->lock);
        return 0;
 }