drm/nouveau: use dev_* for logging

Signed-off-by: Ben Skeggs <bskeggs@redhat.com>

diff --git a/drivers/gpu/drm/nouveau/nouveau_abi16.c b/drivers/gpu/drm/nouveau/nouveau_abi16.c
index c2ba0cc..01ffdb3 100644 (file)
--- a/drivers/gpu/drm/nouveau/nouveau_abi16.c
+++ b/drivers/gpu/drm/nouveau/nouveau_abi16.c
@@ -217,7 +217,7 @@ nouveau_abi16_ioctl_getparam(ABI16_IOCTL_ARGS)
                getparam->value = gr->units ? gr->units(gr) : 0;
                break;
        default:
-               NV_PRINTK(debug, cli, "unknown parameter %lld\n", getparam->param);
+               NV_PRINTK(dbg, cli, "unknown parameter %lld\n", getparam->param);
                return -EINVAL;
        }
 

diff --cc drivers/gpu/drm/nouveau/nouveau_bios.c
Simple merge

diff --cc drivers/gpu/drm/nouveau/nouveau_chan.c
Simple merge

diff --cc drivers/gpu/drm/nouveau/nouveau_drm.c
Simple merge

diff --cc drivers/gpu/drm/nouveau/nouveau_drm.h
Simple merge

diff --cc drivers/gpu/drm/nouveau/nouveau_gem.c
Simple merge

diff --cc drivers/gpu/drm/nouveau/nv50_display.c
Simple merge