Code Review
/
kvmfornfv.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
These changes are the raw update to linux-4.4.6-rt14. Kernel sources
[kvmfornfv.git]
/
kernel
/
drivers
/
gpu
/
drm
/
nouveau
/
nvkm
/
core
/
enum.c
diff --git
a/kernel/drivers/gpu/drm/nouveau/nvkm/core/enum.c
b/kernel/drivers/gpu/drm/nouveau/nvkm/core/enum.c
index
4f92bfc
..
b9581fe
100644
(file)
--- a/
kernel/drivers/gpu/drm/nouveau/nvkm/core/enum.c
+++ b/
kernel/drivers/gpu/drm/nouveau/nvkm/core/enum.c
@@
-38,29
+38,19
@@
nvkm_enum_find(const struct nvkm_enum *en, u32 value)
return NULL;
}
return NULL;
}
-const struct nvkm_enum *
-nvkm_enum_print(const struct nvkm_enum *en, u32 value)
-{
- en = nvkm_enum_find(en, value);
- if (en)
- pr_cont("%s", en->name);
- else
- pr_cont("(unknown enum 0x%08x)", value);
- return en;
-}
-
void
void
-nvkm_
bitfield_print(
const struct nvkm_bitfield *bf, u32 value)
+nvkm_
snprintbf(char *data, int size,
const struct nvkm_bitfield *bf, u32 value)
{
{
- while (bf->name) {
+ bool space = false;
+ while (size >= 1 && bf->name) {
if (value & bf->mask) {
if (value & bf->mask) {
- pr_cont(" %s", bf->name);
- value &= ~bf->mask;
+ int this = snprintf(data, size, "%s%s",
+ space ? " " : "", bf->name);
+ size -= this;
+ data += this;
+ space = true;
}
}
-
bf++;
}
bf++;
}
-
- if (value)
- pr_cont(" (unknown bits 0x%08x)", value);
+ data[0] = '\0';
}
}