diff options
author | Ben Skeggs <bskeggs@redhat.com> | 2015-08-20 14:54:13 +1000 |
---|---|---|
committer | Ben Skeggs <bskeggs@redhat.com> | 2015-08-28 12:40:26 +1000 |
commit | 53003941067534b1071b0f7b71f4700c16d97b28 (patch) | |
tree | b3c749fe4ce5dc57f184ffbdebbaca360081ac34 /drivers/gpu/drm/nouveau/nvkm/engine/device/base.c | |
parent | 9ad97ede4b1b257ccc867d5a1e865049e1f09166 (diff) | |
download | lwn-53003941067534b1071b0f7b71f4700c16d97b28.tar.gz lwn-53003941067534b1071b0f7b71f4700c16d97b28.zip |
drm/nouveau/core: remove last printks
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/nouveau/nvkm/engine/device/base.c')
-rw-r--r-- | drivers/gpu/drm/nouveau/nvkm/engine/device/base.c | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/device/base.c b/drivers/gpu/drm/nouveau/nvkm/engine/device/base.c index c58ea4f44c70..af8f9ccdc8f6 100644 --- a/drivers/gpu/drm/nouveau/nvkm/engine/device/base.c +++ b/drivers/gpu/drm/nouveau/nvkm/engine/device/base.c @@ -87,9 +87,9 @@ nvkm_devobj_info(struct nvkm_object *object, void *data, u32 size) } *args = data; int ret; - nv_ioctl(object, "device info size %d\n", size); + nvif_ioctl(object, "device info size %d\n", size); if (nvif_unpack(args->v0, 0, 0, false)) { - nv_ioctl(object, "device info vers %d\n", args->v0.version); + nvif_ioctl(object, "device info vers %d\n", args->v0.version); } else return ret; @@ -294,12 +294,12 @@ nvkm_devobj_ctor(struct nvkm_object *parent, struct nvkm_object *engine, void __iomem *map; int ret, i, c; - nv_ioctl(parent, "create device size %d\n", size); + nvif_ioctl(parent, "create device size %d\n", size); if (nvif_unpack(args->v0, 0, 0, false)) { - nv_ioctl(parent, "create device v%d device %016llx " - "disable %016llx debug0 %016llx\n", - args->v0.version, args->v0.device, - args->v0.disable, args->v0.debug0); + nvif_ioctl(parent, "create device v%d device %016llx " + "disable %016llx debug0 %016llx\n", + args->v0.version, args->v0.device, + args->v0.disable, args->v0.debug0); } else return ret; @@ -567,8 +567,7 @@ nv_device(void *obj) device = device->parent; } #if CONFIG_NOUVEAU_DEBUG >= NV_DBG_PARANOIA - if (unlikely(!device)) - nv_assert("BAD CAST -> NvDevice, 0x%08x\n", nv_hclass(obj)); + BUG_ON(!device); #endif return (void *)device; } |