spmi: Use more appropriate name for SPMI devices

android-legacy · Jan 17, 2015 · d956d88 · d956d88
1 parent 731cc51
commit d956d88
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/drivers/spmi/spmi.c b/drivers/spmi/spmi.c
@@ -236,7 +236,10 @@ int spmi_add_device(struct spmi_device *spmidev)
 	}
 
 	/* Set the device name */
-	dev_set_name(dev, "%s-%p", spmidev->name, spmidev);
+	if (spmidev->res.resource)
+		dev_set_name(dev, "%02x-%s-%04x", spmidev->sid, spmidev->dev.of_node->name, spmidev->res.resource[0].start);
+	else
+		dev_set_name(dev, "%02x-%s", spmidev->sid, spmidev->dev.of_node->name);
 
 	/* Device may be bound to an active driver when this returns */
 	rc = device_add(dev);