diff options
Diffstat (limited to 'drivers/gpu/drm/nouveau/nvkm/subdev/timer/gk20a.c')
-rw-r--r-- | drivers/gpu/drm/nouveau/nvkm/subdev/timer/gk20a.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/timer/gk20a.c b/drivers/gpu/drm/nouveau/nvkm/subdev/timer/gk20a.c index 37484db1f7fc..80e38063dd9b 100644 --- a/drivers/gpu/drm/nouveau/nvkm/subdev/timer/gk20a.c +++ b/drivers/gpu/drm/nouveau/nvkm/subdev/timer/gk20a.c | |||
@@ -21,18 +21,17 @@ | |||
21 | * | 21 | * |
22 | * Authors: Ben Skeggs | 22 | * Authors: Ben Skeggs |
23 | */ | 23 | */ |
24 | |||
25 | #include "nv04.h" | 24 | #include "nv04.h" |
26 | 25 | ||
27 | static int | 26 | static int |
28 | gk20a_timer_init(struct nouveau_object *object) | 27 | gk20a_timer_init(struct nvkm_object *object) |
29 | { | 28 | { |
30 | struct nv04_timer_priv *priv = (void *)object; | 29 | struct nv04_timer_priv *priv = (void *)object; |
31 | u32 hi = upper_32_bits(priv->suspend_time); | 30 | u32 hi = upper_32_bits(priv->suspend_time); |
32 | u32 lo = lower_32_bits(priv->suspend_time); | 31 | u32 lo = lower_32_bits(priv->suspend_time); |
33 | int ret; | 32 | int ret; |
34 | 33 | ||
35 | ret = nouveau_timer_init(&priv->base); | 34 | ret = nvkm_timer_init(&priv->base); |
36 | if (ret) | 35 | if (ret) |
37 | return ret; | 36 | return ret; |
38 | 37 | ||
@@ -45,10 +44,10 @@ gk20a_timer_init(struct nouveau_object *object) | |||
45 | return 0; | 44 | return 0; |
46 | } | 45 | } |
47 | 46 | ||
48 | struct nouveau_oclass | 47 | struct nvkm_oclass |
49 | gk20a_timer_oclass = { | 48 | gk20a_timer_oclass = { |
50 | .handle = NV_SUBDEV(TIMER, 0xff), | 49 | .handle = NV_SUBDEV(TIMER, 0xff), |
51 | .ofuncs = &(struct nouveau_ofuncs) { | 50 | .ofuncs = &(struct nvkm_ofuncs) { |
52 | .ctor = nv04_timer_ctor, | 51 | .ctor = nv04_timer_ctor, |
53 | .dtor = nv04_timer_dtor, | 52 | .dtor = nv04_timer_dtor, |
54 | .init = gk20a_timer_init, | 53 | .init = gk20a_timer_init, |