summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/nouveau/nvkm/subdev/therm/gm107.c
diff options
context:
space:
mode:
authorBen Skeggs <bskeggs@redhat.com>2015-08-20 06:54:07 +0200
committerBen Skeggs <bskeggs@redhat.com>2015-08-28 04:40:09 +0200
commitda06b46b720687117178d3ee85a601762f1c36b5 (patch)
treeda40c22819f17b63324333d0849e4ce555f8d3fd /drivers/gpu/drm/nouveau/nvkm/subdev/therm/gm107.c
parentdrm/nouveau/pmu: cosmetic changes (diff)
downloadlinux-da06b46b720687117178d3ee85a601762f1c36b5.tar.xz
linux-da06b46b720687117178d3ee85a601762f1c36b5.zip
drm/nouveau/therm: cosmetic changes
This is purely preparation for upcoming commits, there should be no code changes here. Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/nouveau/nvkm/subdev/therm/gm107.c')
-rw-r--r--drivers/gpu/drm/nouveau/nvkm/subdev/therm/gm107.c26
1 files changed, 11 insertions, 15 deletions
diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/therm/gm107.c b/drivers/gpu/drm/nouveau/nvkm/subdev/therm/gm107.c
index c1f3cf361837..f2271f3e5990 100644
--- a/drivers/gpu/drm/nouveau/nvkm/subdev/therm/gm107.c
+++ b/drivers/gpu/drm/nouveau/nvkm/subdev/therm/gm107.c
@@ -23,10 +23,6 @@
*/
#include "priv.h"
-struct gm107_therm_priv {
- struct nvkm_therm_priv base;
-};
-
static int
gm107_fan_pwm_ctrl(struct nvkm_therm *therm, int line, bool enable)
{
@@ -61,22 +57,22 @@ gm107_therm_ctor(struct nvkm_object *parent, struct nvkm_object *engine,
struct nvkm_oclass *oclass, void *data, u32 size,
struct nvkm_object **pobject)
{
- struct gm107_therm_priv *priv;
+ struct nvkm_therm_priv *therm;
int ret;
- ret = nvkm_therm_create(parent, engine, oclass, &priv);
- *pobject = nv_object(priv);
+ ret = nvkm_therm_create(parent, engine, oclass, &therm);
+ *pobject = nv_object(therm);
if (ret)
return ret;
- priv->base.base.pwm_ctrl = gm107_fan_pwm_ctrl;
- priv->base.base.pwm_get = gm107_fan_pwm_get;
- priv->base.base.pwm_set = gm107_fan_pwm_set;
- priv->base.base.pwm_clock = gm107_fan_pwm_clock;
- priv->base.base.temp_get = g84_temp_get;
- priv->base.base.fan_sense = gt215_therm_fan_sense;
- priv->base.sensor.program_alarms = nvkm_therm_program_alarms_polling;
- return nvkm_therm_preinit(&priv->base.base);
+ therm->base.pwm_ctrl = gm107_fan_pwm_ctrl;
+ therm->base.pwm_get = gm107_fan_pwm_get;
+ therm->base.pwm_set = gm107_fan_pwm_set;
+ therm->base.pwm_clock = gm107_fan_pwm_clock;
+ therm->base.temp_get = g84_temp_get;
+ therm->base.fan_sense = gt215_therm_fan_sense;
+ therm->sensor.program_alarms = nvkm_therm_program_alarms_polling;
+ return nvkm_therm_preinit(&therm->base);
}
struct nvkm_oclass