summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKaushal Kumar <kaushalk@codeaurora.org>2016-03-02 16:48:19 +0530
committerDavid Keitel <dkeitel@codeaurora.org>2016-03-25 16:02:46 -0700
commitf9b5c372bb2eb11da82c7039551ec7f7a39c826f (patch)
tree43f5927c8b64d831518ca579645462bcbd233ee4
parentb2d171c18b9af0d484e52a71409888b90a156f5b (diff)
Revert "of/platform: Move platform devices under /sys/devices/platform"
This reverts commit 43c0767e17ac ("of/platform: Move platform devices under /sys/devices/platform"). Userspace code that expects to find devices under a fixed /sys/devices/... path are affected by moving platform devices under /sys/devices/platform. Change-Id: I6a108c46c1b2e3985797bb86a3ed84a29ab286a8 Signed-off-by: Kaushal Kumar <kaushalk@codeaurora.org>
-rw-r--r--drivers/of/platform.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/of/platform.c b/drivers/of/platform.c
index 226430943b6a..2924c8141f16 100644
--- a/drivers/of/platform.c
+++ b/drivers/of/platform.c
@@ -140,7 +140,7 @@ struct platform_device *of_device_alloc(struct device_node *np,
}
dev->dev.of_node = of_node_get(np);
- dev->dev.parent = parent ? : &platform_bus;
+ dev->dev.parent = parent;
if (bus_id)
dev_set_name(&dev->dev, "%s", bus_id);
@@ -243,7 +243,7 @@ static struct amba_device *of_amba_device_create(struct device_node *node,
/* setup generic device info */
dev->dev.of_node = of_node_get(node);
- dev->dev.parent = parent ? : &platform_bus;
+ dev->dev.parent = parent;
dev->dev.platform_data = platform_data;
if (bus_id)
dev_set_name(&dev->dev, "%s", bus_id);