diff options
author | Joe Perches <joe@perches.com> | 2012-01-29 07:56:23 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2012-01-31 16:20:21 -0500 |
commit | e404decb0fb017be80552adee894b35307b6c7b4 (patch) | |
tree | 19b2324328eb1f8cef599f9f164dc9ca6e5699c9 /drivers/net/netconsole.c | |
parent | 5f3d9cb2962967d9d7e03abb4a7ca275a9a3fea5 (diff) |
drivers/net: Remove unnecessary k.alloc/v.alloc OOM messages
alloc failures use dump_stack so emitting an additional
out-of-memory message is an unnecessary duplication.
Remove the allocation failure messages.
Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/netconsole.c')
-rw-r--r-- | drivers/net/netconsole.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/drivers/net/netconsole.c b/drivers/net/netconsole.c index e8882023576b..f9347ea3d381 100644 --- a/drivers/net/netconsole.c +++ b/drivers/net/netconsole.c | |||
@@ -169,10 +169,8 @@ static struct netconsole_target *alloc_param_target(char *target_config) | |||
169 | * Note that these targets get their config_item fields zeroed-out. | 169 | * Note that these targets get their config_item fields zeroed-out. |
170 | */ | 170 | */ |
171 | nt = kzalloc(sizeof(*nt), GFP_KERNEL); | 171 | nt = kzalloc(sizeof(*nt), GFP_KERNEL); |
172 | if (!nt) { | 172 | if (!nt) |
173 | printk(KERN_ERR "netconsole: failed to allocate memory\n"); | ||
174 | goto fail; | 173 | goto fail; |
175 | } | ||
176 | 174 | ||
177 | nt->np.name = "netconsole"; | 175 | nt->np.name = "netconsole"; |
178 | strlcpy(nt->np.dev_name, "eth0", IFNAMSIZ); | 176 | strlcpy(nt->np.dev_name, "eth0", IFNAMSIZ); |
@@ -551,10 +549,8 @@ static struct config_item *make_netconsole_target(struct config_group *group, | |||
551 | * Target is disabled at creation (enabled == 0). | 549 | * Target is disabled at creation (enabled == 0). |
552 | */ | 550 | */ |
553 | nt = kzalloc(sizeof(*nt), GFP_KERNEL); | 551 | nt = kzalloc(sizeof(*nt), GFP_KERNEL); |
554 | if (!nt) { | 552 | if (!nt) |
555 | printk(KERN_ERR "netconsole: failed to allocate memory\n"); | ||
556 | return ERR_PTR(-ENOMEM); | 553 | return ERR_PTR(-ENOMEM); |
557 | } | ||
558 | 554 | ||
559 | nt->np.name = "netconsole"; | 555 | nt->np.name = "netconsole"; |
560 | strlcpy(nt->np.dev_name, "eth0", IFNAMSIZ); | 556 | strlcpy(nt->np.dev_name, "eth0", IFNAMSIZ); |