Commit fa622c9e authored by Krzysztof Kozlowski's avatar Krzysztof Kozlowski Committed by Rob Herring (Arm)
Browse files

platform: surface: Simplify with of_machine_get_match_data() 



Replace open-coded getting root OF node, matching against it and getting
the match data with new of_machine_get_match_data() helper.

Acked-by: default avatarIlpo Järvinen <ilpo.jarvinen@linux.intel.com>
Signed-off-by: default avatarKrzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
Reviewed-by: default avatarAngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com>
Link: https://patch.msgid.link/20251112-b4-of-match-matchine-data-v2-8-d46b72003fd6@linaro.org


Signed-off-by: default avatarRob Herring (Arm) <robh@kernel.org>
parent 43044697

drivers/platform/surface/surface_aggregator_registry.c

+1 −12
Original line number Diff line number Diff line
@@ -491,24 +491,13 @@ static const struct of_device_id ssam_platform_hub_of_match[] __maybe_unused = { 
static int ssam_platform_hub_probe(struct platform_device *pdev)

{

	const struct software_node **nodes;

	const struct of_device_id *match;

	struct device_node *fdt_root;

	struct ssam_controller *ctrl;

	struct fwnode_handle *root;

	int status;



	nodes = (const struct software_node **)acpi_device_get_match_data(&pdev->dev);

	if (!nodes) {

		fdt_root = of_find_node_by_path("/");

		if (!fdt_root)

			return -ENODEV;



		match = of_match_node(ssam_platform_hub_of_match, fdt_root);

		of_node_put(fdt_root);

		if (!match)

			return -ENODEV;



		nodes = (const struct software_node **)match->data;

		nodes = (const struct software_node **)of_machine_get_match_data(ssam_platform_hub_of_match);

		if (!nodes)

			return -ENODEV;

	}