Skip to content

Commit d45c46c

Browse files
krzkgregkh
authored andcommitted
soc: qcom: ocmem: use scoped device node handling to simplify error paths
[ Upstream commit f4c1c19 ] Obtain the device node reference with scoped/cleanup.h to reduce error handling and make the code a bit simpler. Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org> Link: https://lore.kernel.org/r/20240813-b4-cleanup-h-of-node-put-other-v1-4-cfb67323a95c@linaro.org Signed-off-by: Bjorn Andersson <andersson@kernel.org> Stable-dep-of: 9dfd69c ("soc: qcom: ocmem: register reasons for probe deferrals") Signed-off-by: Sasha Levin <sashal@kernel.org>
1 parent 1637ce3 commit d45c46c

1 file changed

Lines changed: 2 additions & 5 deletions

File tree

drivers/soc/qcom/ocmem.c

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -185,23 +185,20 @@ static void update_range(struct ocmem *ocmem, struct ocmem_buf *buf,
185185
struct ocmem *of_get_ocmem(struct device *dev)
186186
{
187187
struct platform_device *pdev;
188-
struct device_node *devnode;
189188
struct ocmem *ocmem;
190189

191-
devnode = of_parse_phandle(dev->of_node, "sram", 0);
190+
struct device_node *devnode __free(device_node) = of_parse_phandle(dev->of_node,
191+
"sram", 0);
192192
if (!devnode || !devnode->parent) {
193193
dev_err(dev, "Cannot look up sram phandle\n");
194-
of_node_put(devnode);
195194
return ERR_PTR(-ENODEV);
196195
}
197196

198197
pdev = of_find_device_by_node(devnode->parent);
199198
if (!pdev) {
200199
dev_err(dev, "Cannot find device node %s\n", devnode->name);
201-
of_node_put(devnode);
202200
return ERR_PTR(-EPROBE_DEFER);
203201
}
204-
of_node_put(devnode);
205202

206203
ocmem = platform_get_drvdata(pdev);
207204
put_device(&pdev->dev);

0 commit comments

Comments
 (0)