提交 499b42c3 编写于 作者: G Grant Likely

powerpc: Fix fallout from device_node->name constification

Commit c22618a1, "drivers/of: Constify device_node->name and
->path_component_name" changes device_node name to a const value, but
the PowerPC scom code still assigns it to a non-void field in
debugfs_blob_wrapper. The /right/ solution might be to change the
debugfs_blob_wrapper->data to also be const, but that is a bit
risky. Instead, cast the value to (void*). It is a bit ugly, but it
is the safest change until it can be investigated where
debugfs_blob_wrapper can be modified.
Reported-by: NMichael Neuling <mikey@neuling.org>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: NGrant Likely <grant.likely@secretlab.ca>
上级 b8fbdc42
...@@ -157,7 +157,7 @@ static int scom_debug_init_one(struct dentry *root, struct device_node *dn, ...@@ -157,7 +157,7 @@ static int scom_debug_init_one(struct dentry *root, struct device_node *dn,
ent->map = SCOM_MAP_INVALID; ent->map = SCOM_MAP_INVALID;
spin_lock_init(&ent->lock); spin_lock_init(&ent->lock);
snprintf(ent->name, 8, "scom%d", i); snprintf(ent->name, 8, "scom%d", i);
ent->blob.data = dn->full_name; ent->blob.data = (void*) dn->full_name;
ent->blob.size = strlen(dn->full_name); ent->blob.size = strlen(dn->full_name);
dir = debugfs_create_dir(ent->name, root); dir = debugfs_create_dir(ent->name, root);
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册