Merge branch 'drm-next' of git://people.freedesktop.org/~airlied/linux

[cascardo/linux.git] / drivers / gpu / drm / nouveau / nvkm / subdev / therm / gt215.c

diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/therm/gt215.c b/drivers/gpu/drm/nouveau/nvkm/subdev/therm/gt215.c
index 8814d85..c08097f 100644 (file)
--- a/drivers/gpu/drm/nouveau/nvkm/subdev/therm/gt215.c
+++ b/drivers/gpu/drm/nouveau/nvkm/subdev/therm/gt215.c
@@ -36,62 +36,40 @@ gt215_therm_fan_sense(struct nvkm_therm *therm)
        return -ENODEV;
 }
 
-static int
-gt215_therm_init(struct nvkm_object *object)
+static void
+gt215_therm_init(struct nvkm_therm *therm)
 {
-       struct nvkm_therm_priv *therm = (void *)object;
-       struct nvkm_device *device = therm->base.subdev.device;
+       struct nvkm_device *device = therm->subdev.device;
        struct dcb_gpio_func *tach = &therm->fan->tach;
-       int ret;
-
-       ret = nvkm_therm_init(&therm->base);
-       if (ret)
-               return ret;
 
-       g84_sensor_setup(&therm->base);
+       g84_sensor_setup(therm);
 
        /* enable fan tach, count revolutions per-second */
        nvkm_mask(device, 0x00e720, 0x00000003, 0x00000002);
        if (tach->func != DCB_GPIO_UNUSED) {
-               nvkm_wr32(device, 0x00e724, nv_device(therm)->crystal * 1000);
+               nvkm_wr32(device, 0x00e724, device->crystal * 1000);
                nvkm_mask(device, 0x00e720, 0x001f0000, tach->line << 16);
                nvkm_mask(device, 0x00e720, 0x00000001, 0x00000001);
        }
        nvkm_mask(device, 0x00e720, 0x00000002, 0x00000000);
-
-       return 0;
 }
 
-static int
-gt215_therm_ctor(struct nvkm_object *parent, struct nvkm_object *engine,
-                struct nvkm_oclass *oclass, void *data, u32 size,
-                struct nvkm_object **pobject)
-{
-       struct nvkm_therm_priv *therm;
-       int ret;
-
-       ret = nvkm_therm_create(parent, engine, oclass, &therm);
-       *pobject = nv_object(therm);
-       if (ret)
-               return ret;
+static const struct nvkm_therm_func
+gt215_therm = {
+       .init = gt215_therm_init,
+       .fini = g84_therm_fini,
+       .pwm_ctrl = nv50_fan_pwm_ctrl,
+       .pwm_get = nv50_fan_pwm_get,
+       .pwm_set = nv50_fan_pwm_set,
+       .pwm_clock = nv50_fan_pwm_clock,
+       .temp_get = g84_temp_get,
+       .fan_sense = gt215_therm_fan_sense,
+       .program_alarms = nvkm_therm_program_alarms_polling,
+};
 
-       therm->base.pwm_ctrl = nv50_fan_pwm_ctrl;
-       therm->base.pwm_get = nv50_fan_pwm_get;
-       therm->base.pwm_set = nv50_fan_pwm_set;
-       therm->base.pwm_clock = nv50_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);
+int
+gt215_therm_new(struct nvkm_device *device, int index,
+              struct nvkm_therm **ptherm)
+{
+       return nvkm_therm_new_(&gt215_therm, device, index, ptherm);
 }
-
-struct nvkm_oclass
-gt215_therm_oclass = {
-       .handle = NV_SUBDEV(THERM, 0xa3),
-       .ofuncs = &(struct nvkm_ofuncs) {
-               .ctor = gt215_therm_ctor,
-               .dtor = _nvkm_therm_dtor,
-               .init = gt215_therm_init,
-               .fini = g84_therm_fini,
-       },
-};