Skip to content

Commit

Permalink
of: unittest: Remove error printing on OOM
Browse files Browse the repository at this point in the history
There is no need to print a backtrace or other error message if
kzalloc(), kmemdup(), or devm_kzalloc() fails, as the memory allocation
core already takes care of that.

Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: Rob Herring <robh@kernel.org>
  • Loading branch information
Geert Uytterhoeven authored and Rob Herring committed May 2, 2019
1 parent 6f7dc9a commit 2a656cb
Showing 1 changed file with 4 additions and 9 deletions.
13 changes: 4 additions & 9 deletions drivers/of/unittest.c
Original file line number Diff line number Diff line change
Expand Up @@ -344,7 +344,7 @@ static void __init of_unittest_check_phandles(void)
}

nh = kzalloc(sizeof(*nh), GFP_KERNEL);
if (WARN_ON(!nh))
if (!nh)
return;

nh->np = np;
Expand Down Expand Up @@ -1199,12 +1199,9 @@ static int __init unittest_data_add(void)

/* creating copy */
unittest_data = kmemdup(__dtb_testcases_begin, size, GFP_KERNEL);

if (!unittest_data) {
pr_warn("%s: Failed to allocate memory for unittest_data; "
"not running tests\n", __func__);
if (!unittest_data)
return -ENOMEM;
}

of_fdt_unflatten_tree(unittest_data, NULL, &unittest_data_node);
if (!unittest_data_node) {
pr_warn("%s: No tree to attach; not running tests\n", __func__);
Expand Down Expand Up @@ -1845,10 +1842,8 @@ static int unittest_i2c_bus_probe(struct platform_device *pdev)
dev_dbg(dev, "%s for node @%pOF\n", __func__, np);

std = devm_kzalloc(dev, sizeof(*std), GFP_KERNEL);
if (!std) {
dev_err(dev, "Failed to allocate unittest i2c data\n");
if (!std)
return -ENOMEM;
}

/* link them together */
std->pdev = pdev;
Expand Down

0 comments on commit 2a656cb

Please sign in to comment.