powerpc: Fix fallout from device_node->name constification
authorGrant Likely <grant.likely@secretlab.ca>
Thu, 29 Nov 2012 16:35:41 +0000 (16:35 +0000)
committerGrant Likely <grant.likely@secretlab.ca>
Thu, 29 Nov 2012 17:27:19 +0000 (17:27 +0000)
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: Michael Neuling <mikey@neuling.org>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
arch/powerpc/sysdev/scom.c

index 702256a..9193e12 100644 (file)
@@ -157,7 +157,7 @@ static int scom_debug_init_one(struct dentry *root, struct device_node *dn,
        ent->map = SCOM_MAP_INVALID;
        spin_lock_init(&ent->lock);
        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);
 
        dir = debugfs_create_dir(ent->name, root);