redonkable
/
alistair23-linux
1
0
Fork 0
Code Releases Activity

firmware/dmi_scan: drop OOM messages 

As reported by Joe Perches: OOM messages generally aren't useful.
dmi_alloc is either a trivial front-end to kzalloc, and kzalloc already
does a dump_stack() when OOM, or for x86, dmi_alloc uses extend_brk
which BUGs when unsuccessful.

So we can remove all 6 such log messages in the dmi_scan driver, to
shrink the binary size (by 528 bytes on x86_64.)

Signed-off-by: Jean Delvare <jdelvare@suse.de>
Reported-by: Joe Perches <joe@perches.com>
Cc: Ben Hutchings <ben@decadent.org.uk>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
hifive-unleashed-5.1
Jean Delvare 2013-09-11 14:24:10 -07:00 committed by Linus Torvalds
parent ffbbb96dd7
commit ae79744975
1 changed files with 6 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
drivers/firmware/dmi_scan.c
View File

@ -62,8 +62,6 @@ static const char * __init dmi_string(const struct dmi_header *dm, u8 s)
str = dmi_alloc(len);
if (str != NULL)
strcpy(str, bp);
else
pr_err("dmi_string: cannot allocate %Zu bytes.\n", len);
return str;
}
@ -219,10 +217,8 @@ static void __init dmi_save_one_device(int type, const char *name)
return;
dev = dmi_alloc(sizeof(*dev) + strlen(name) + 1);
if (!dev) {
pr_err("dmi_save_one_device: out of memory.\n");
if (!dev)
return;
}
dev->type = type;
strcpy((char *)(dev + 1), name);
@ -258,10 +254,8 @@ static void __init dmi_save_oem_strings_devices(const struct dmi_header *dm)
continue;
dev = dmi_alloc(sizeof(*dev));
if (!dev) {
pr_err("dmi_save_oem_strings_devices: out of memory.\n");
if (!dev)
break;
}
dev->type = DMI_DEV_TYPE_OEM_STRING;
dev->name = devname;
@ -277,18 +271,14 @@ static void __init dmi_save_ipmi_device(const struct dmi_header *dm)
void *data;
data = dmi_alloc(dm->length);
if (data == NULL) {
pr_err("dmi_save_ipmi_device: out of memory.\n");
if (data == NULL)
return;
}
memcpy(data, dm, dm->length);
dev = dmi_alloc(sizeof(*dev));
if (!dev) {
pr_err("dmi_save_ipmi_device: out of memory.\n");
if (!dev)
return;
}
dev->type = DMI_DEV_TYPE_IPMI;
dev->name = "IPMI controller";
@ -303,10 +293,9 @@ static void __init dmi_save_dev_onboard(int instance, int segment, int bus,
struct dmi_dev_onboard *onboard_dev;
onboard_dev = dmi_alloc(sizeof(*onboard_dev) + strlen(name) + 1);
if (!onboard_dev) {
pr_err("dmi_save_dev_onboard: out of memory.\n");
if (!onboard_dev)
return;
}
onboard_dev->instance = instance;
onboard_dev->segment = segment;
onboard_dev->bus = bus;