aboutsummaryrefslogtreecommitdiff
path: root/drivers/gpu/drm/nouveau/core/core
diff options
context:
space:
mode:
authorBen Skeggs <bskeggs@redhat.com>2012-09-12 13:09:23 +1000
committerBen Skeggs <bskeggs@redhat.com>2012-10-03 13:13:10 +1000
commitfa6df8c163ddf1fba658059695ab9587f344712c (patch)
treeede64264bed984ed9dc3c376689ec9b3194ddf97 /drivers/gpu/drm/nouveau/core/core
parentb3ccd34ded3e730bba33cd4bd4b7ab78b4a0bb03 (diff)
drm/nouveau/core: have client-id be a string, rather than an integer
Can be somewhat more informative that way... Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/nouveau/core/core')
-rw-r--r--drivers/gpu/drm/nouveau/core/core/client.c6
-rw-r--r--drivers/gpu/drm/nouveau/core/core/printk.c4
2 files changed, 5 insertions, 5 deletions
diff --git a/drivers/gpu/drm/nouveau/core/core/client.c b/drivers/gpu/drm/nouveau/core/core/client.c
index e190f184911..c617f048007 100644
--- a/drivers/gpu/drm/nouveau/core/core/client.c
+++ b/drivers/gpu/drm/nouveau/core/core/client.c
@@ -46,8 +46,8 @@ nouveau_client_oclass = {
};
int
-nouveau_client_create_(u32 name, u64 devname, const char *cfg, const char *dbg,
- int length, void **pobject)
+nouveau_client_create_(const char *name, u64 devname, const char *cfg,
+ const char *dbg, int length, void **pobject)
{
struct nouveau_object *device;
struct nouveau_client *client;
@@ -75,7 +75,7 @@ nouveau_client_create_(u32 name, u64 devname, const char *cfg, const char *dbg,
atomic_set(&nv_object(client)->usecount, 2);
nouveau_object_ref(device, &client->device);
- client->handle = name;
+ snprintf(client->name, sizeof(client->name), "%s", name);
client->debug = nouveau_dbgopt(dbg, "CLIENT");
return 0;
}
diff --git a/drivers/gpu/drm/nouveau/core/core/printk.c b/drivers/gpu/drm/nouveau/core/core/printk.c
index 134dd6d1297..6161eaf5447 100644
--- a/drivers/gpu/drm/nouveau/core/core/printk.c
+++ b/drivers/gpu/drm/nouveau/core/core/printk.c
@@ -62,8 +62,8 @@ nv_printk_(struct nouveau_object *object, const char *pfx, int level,
if (level > nv_client(object)->debug)
return;
- snprintf(mfmt, sizeof(mfmt), "%snouveau %c[%8d] %s", pfx,
- name[level], nv_client(object)->handle, fmt);
+ snprintf(mfmt, sizeof(mfmt), "%snouveau %c[%8s] %s", pfx,
+ name[level], nv_client(object)->name, fmt);
} else {
snprintf(mfmt, sizeof(mfmt), "%snouveau: %s", pfx, fmt);
}