summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/nouveau/include/nvif
diff options
context:
space:
mode:
authorBen Skeggs <bskeggs@redhat.com>2015-08-20 06:54:11 +0200
committerBen Skeggs <bskeggs@redhat.com>2015-08-28 04:40:21 +0200
commit5444204036b2e3a4aeeef6265897df3a9976bf97 (patch)
tree4a9c11d17c26b4430c463977847873940c31a898 /drivers/gpu/drm/nouveau/include/nvif
parentdrm/nouveau/mpeg: switch to new-style timer macros (diff)
downloadlinux-5444204036b2e3a4aeeef6265897df3a9976bf97.tar.xz
linux-5444204036b2e3a4aeeef6265897df3a9976bf97.zip
drm/nouveau: switch to new-style timer macros
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/nouveau/include/nvif')
-rw-r--r--drivers/gpu/drm/nouveau/include/nvif/device.h2
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/gpu/drm/nouveau/include/nvif/device.h b/drivers/gpu/drm/nouveau/include/nvif/device.h
index 8bd60dd3b161..077651f9b7e9 100644
--- a/drivers/gpu/drm/nouveau/include/nvif/device.h
+++ b/drivers/gpu/drm/nouveau/include/nvif/device.h
@@ -68,8 +68,6 @@ u64 nvif_device_time(struct nvif_device *);
#define nvxx_clk(a) nvkm_clk(nvxx_device(a))
#define nvxx_i2c(a) nvkm_i2c(nvxx_device(a))
#define nvxx_timer(a) nvkm_timer(nvxx_device(a))
-#define nvxx_wait(a,b,c,d) nv_wait(nvxx_timer(a), (b), (c), (d))
-#define nvxx_wait_cb(a,b,c) nv_wait_cb(nvxx_timer(a), (b), (c))
#define nvxx_therm(a) nvkm_therm(nvxx_device(a))
#include <core/device.h>