Skip to content

Commit 719af32

Browse files
charleskeepaxbroonie
authored andcommitted
spi: cs42l43: Use devm_add_action_or_reset()
Use devm_add_action_or_reset() rather than manually cleaning up on the error path. Suggested-by: Andy Shevchenko <[email protected]> Signed-off-by: Charles Keepax <[email protected]> Reviewed-by: Andy Shevchenko <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Mark Brown <[email protected]>
1 parent 1f48cbd commit 719af32

File tree

1 file changed

+4
-8
lines changed

1 file changed

+4
-8
lines changed

drivers/spi/spi-cs42l43.c

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -345,11 +345,9 @@ static int cs42l43_spi_probe(struct platform_device *pdev)
345345

346346
if (is_of_node(fwnode)) {
347347
fwnode = fwnode_get_named_child_node(fwnode, "spi");
348-
ret = devm_add_action(priv->dev, cs42l43_release_of_node, fwnode);
349-
if (ret) {
350-
fwnode_handle_put(fwnode);
348+
ret = devm_add_action_or_reset(priv->dev, cs42l43_release_of_node, fwnode);
349+
if (ret)
351350
return ret;
352-
}
353351
}
354352

355353
if (has_sidecar) {
@@ -358,11 +356,9 @@ static int cs42l43_spi_probe(struct platform_device *pdev)
358356
return dev_err_probe(priv->dev, ret,
359357
"Failed to register gpio swnode\n");
360358

361-
ret = devm_add_action(priv->dev, cs42l43_release_sw_node, NULL);
362-
if (ret) {
363-
software_node_unregister(&cs42l43_gpiochip_swnode);
359+
ret = devm_add_action_or_reset(priv->dev, cs42l43_release_sw_node, NULL);
360+
if (ret)
364361
return ret;
365-
}
366362

367363
ret = device_create_managed_software_node(&priv->ctlr->dev,
368364
cs42l43_cs_props, NULL);

0 commit comments

Comments
 (0)