@@ -701,12 +701,14 @@ static const struct acpm_handle *acpm_get_by_phandle(struct device *dev,
link = device_link_add(dev, &pdev->dev, DL_FLAG_AUTOREMOVE_SUPPLIER);
if (!link) {
- dev_err(&pdev->dev,
- "Failed to create device link to consumer %s.\n",
- dev_name(dev));
+ int ret = -EINVAL;
+
+ dev_err_probe(&pdev->dev, ret,
+ "Failed to create device link to consumer %s.\n",
+ dev_name(dev));
platform_device_put(pdev);
module_put(pdev->dev.driver->owner);
- return ERR_PTR(-EINVAL);
+ return ERR_PTR(ret);
}
return &acpm->handle;
dev_err_probe() exists to simplify code and unify error messages by using its message template. Convert the remaining dev_err() in acpm_get_by_phandle() to dev_err_probe(). Signed-off-by: André Draszik <andre.draszik@linaro.org> --- drivers/firmware/samsung/exynos-acpm.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-)