Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7bca9bcc authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "Revert "of/platform: Move platform devices under /sys/devices/platform""

parents daf89ddc 1f6b9d08

drivers/of/platform.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -140,7 +140,7 @@ struct platform_device *of_device_alloc(struct device_node *np, 
	}

	}





	dev->dev.of_node = of_node_get(np);

	dev->dev.of_node = of_node_get(np);

	dev->dev.parent = parent ? : &platform_bus;

	dev->dev.parent = parent;





	if (bus_id)

	if (bus_id)

		dev_set_name(&dev->dev, "%s", bus_id);

		dev_set_name(&dev->dev, "%s", bus_id);
@@ -244,7 +244,7 @@ static struct amba_device *of_amba_device_create(struct device_node *node, 




	/* setup generic device info */

	/* setup generic device info */

	dev->dev.of_node = of_node_get(node);

	dev->dev.of_node = of_node_get(node);

	dev->dev.parent = parent ? : &platform_bus;

	dev->dev.parent = parent;

	dev->dev.platform_data = platform_data;

	dev->dev.platform_data = platform_data;

	if (bus_id)

	if (bus_id)

		dev_set_name(&dev->dev, "%s", bus_id);

		dev_set_name(&dev->dev, "%s", bus_id);