Gh0st
/
linux
mirror of https://github.com/torvalds/linux.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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>
This commit is contained in:
Krzysztof Kozlowski 2025-11-12 11:28:53 +01:00 committed by Rob Herring (Arm)
parent 4304469751
commit fa622c9e9b
1 changed files with 1 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
drivers/platform/surface/surface_aggregator_registry.c
View File

@ -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) static int ssam_platform_hub_probe(struct platform_device *pdev)
{ {
const struct software_node **nodes; const struct software_node **nodes;
const struct of_device_id *match;
struct device_node *fdt_root;
struct ssam_controller *ctrl; struct ssam_controller *ctrl;
struct fwnode_handle *root; struct fwnode_handle *root;
int status; int status;
nodes = (const struct software_node **)acpi_device_get_match_data(&pdev->dev); nodes = (const struct software_node **)acpi_device_get_match_data(&pdev->dev);
if (!nodes) { if (!nodes) {
fdt_root = of_find_node_by_path("/"); nodes = (const struct software_node **)of_machine_get_match_data(ssam_platform_hub_of_match);
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;
if (!nodes) if (!nodes)
return -ENODEV; return -ENODEV;
} }