Skip to content

Commit

Permalink
ARM: OMAP2+: SmartReflex: Delete an error message for a failed memory…
Browse files Browse the repository at this point in the history
… allocation in two functions

Omit an extra message for a memory allocation failure in these functions.

This issue was detected by using the Coccinelle software.

Link: http://events.linuxfoundation.org/sites/events/files/slides/LCJ16-Refactor_Strings-WSang_0.pdf
Signed-off-by: Markus Elfring <elfring@users.sourceforge.net>
Signed-off-by: Tony Lindgren <tony@atomide.com>
  • Loading branch information
Markus Elfring authored and Tony Lindgren committed Jun 8, 2017
1 parent 6b72de4 commit c76e4d2
Showing 1 changed file with 2 additions and 7 deletions.
9 changes: 2 additions & 7 deletions arch/arm/mach-omap2/sr_device.c
Original file line number Diff line number Diff line change
Expand Up @@ -45,10 +45,8 @@ static void __init sr_set_nvalues(struct omap_volt_data *volt_data,
count++;

nvalue_table = kcalloc(count, sizeof(*nvalue_table), GFP_KERNEL);
if (!nvalue_table) {
pr_err("OMAP: SmartReflex: cannot allocate memory for n-value table\n");
if (!nvalue_table)
return;
}

for (i = 0, j = 0; i < count; i++) {
u32 v;
Expand Down Expand Up @@ -101,11 +99,8 @@ static int __init sr_dev_init(struct omap_hwmod *oh, void *user)
static int i;

sr_data = kzalloc(sizeof(*sr_data), GFP_KERNEL);
if (!sr_data) {
pr_err("%s: Unable to allocate memory for %s sr_data\n",
__func__, oh->name);
if (!sr_data)
return -ENOMEM;
}

sr_dev_attr = (struct omap_smartreflex_dev_attr *)oh->dev_attr;
if (!sr_dev_attr || !sr_dev_attr->sensor_voltdm_name) {
Expand Down

0 comments on commit c76e4d2

Please sign in to comment.