Skip to content

Commit fa622c9

Browse files
krzkrobherring
authored andcommitted
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: Ilpo Järvinen <ilpo.jarvinen@linux.intel.com> Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org> Reviewed-by: AngeloGioacchino 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: Rob Herring (Arm) <robh@kernel.org>
1 parent 4304469 commit fa622c9

1 file changed

Lines changed: 1 addition & 12 deletions

File tree

drivers/platform/surface/surface_aggregator_registry.c

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -491,24 +491,13 @@ static const struct of_device_id ssam_platform_hub_of_match[] __maybe_unused = {
491491
static int ssam_platform_hub_probe(struct platform_device *pdev)
492492
{
493493
const struct software_node **nodes;
494-
const struct of_device_id *match;
495-
struct device_node *fdt_root;
496494
struct ssam_controller *ctrl;
497495
struct fwnode_handle *root;
498496
int status;
499497

500498
nodes = (const struct software_node **)acpi_device_get_match_data(&pdev->dev);
501499
if (!nodes) {
502-
fdt_root = of_find_node_by_path("/");
503-
if (!fdt_root)
504-
return -ENODEV;
505-
506-
match = of_match_node(ssam_platform_hub_of_match, fdt_root);
507-
of_node_put(fdt_root);
508-
if (!match)
509-
return -ENODEV;
510-
511-
nodes = (const struct software_node **)match->data;
500+
nodes = (const struct software_node **)of_machine_get_match_data(ssam_platform_hub_of_match);
512501
if (!nodes)
513502
return -ENODEV;
514503
}

0 commit comments

Comments
 (0)