diff options
author | Joe Perches <joe@perches.com> | 2011-08-25 09:22:24 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2011-08-28 17:16:13 -0400 |
commit | 7ac2ed0ceeafa130f85aa947b271b571c68b9e75 (patch) | |
tree | 7f08a891990d46c84b0dd6b665fc0a70451fb6b2 /net/caif/cfsrvl.c | |
parent | 343e43c02850a3abcd22bd144e5bdbc92fdd273c (diff) |
caif: Remove OOM messages, use kzalloc
Remove per site OOM messages because they duplicate
the generic mm subsystem OOM message.
Use kzalloc instead of kmalloc/memset
when next to the OOM message removals.
Reduces object size (allyesconfig ~2%)
$ size -t drivers/net/caif/built-in.o.old net/caif/built-in.o.old
text data bss dec hex filename
32297 700 8224 41221 a105 drivers/net/caif/built-in.o.old
72159 1317 20552 94028 16f4c net/caif/built-in.o.old
104456 2017 28776 135249 21051 (TOTALS)
$ size -t drivers/net/caif/built-in.o.new net/caif/built-in.o.new
text data bss dec hex filename
31975 700 8184 40859 9f9b drivers/net/caif/built-in.o.new
70748 1317 20152 92217 16839 net/caif/built-in.o.new
102723 2017 28336 133076 207d4 (TOTALS)
Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/caif/cfsrvl.c')
-rw-r--r-- | net/caif/cfsrvl.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/net/caif/cfsrvl.c b/net/caif/cfsrvl.c index 535a1e72b366..b99f5b22689d 100644 --- a/net/caif/cfsrvl.c +++ b/net/caif/cfsrvl.c | |||
@@ -108,10 +108,8 @@ static int cfservl_modemcmd(struct cflayer *layr, enum caif_modemcmd ctrl) | |||
108 | struct caif_payload_info *info; | 108 | struct caif_payload_info *info; |
109 | u8 flow_on = SRVL_FLOW_ON; | 109 | u8 flow_on = SRVL_FLOW_ON; |
110 | pkt = cfpkt_create(SRVL_CTRL_PKT_SIZE); | 110 | pkt = cfpkt_create(SRVL_CTRL_PKT_SIZE); |
111 | if (!pkt) { | 111 | if (!pkt) |
112 | pr_warn("Out of memory\n"); | ||
113 | return -ENOMEM; | 112 | return -ENOMEM; |
114 | } | ||
115 | 113 | ||
116 | if (cfpkt_add_head(pkt, &flow_on, 1) < 0) { | 114 | if (cfpkt_add_head(pkt, &flow_on, 1) < 0) { |
117 | pr_err("Packet is erroneous!\n"); | 115 | pr_err("Packet is erroneous!\n"); |
@@ -130,10 +128,8 @@ static int cfservl_modemcmd(struct cflayer *layr, enum caif_modemcmd ctrl) | |||
130 | struct caif_payload_info *info; | 128 | struct caif_payload_info *info; |
131 | u8 flow_off = SRVL_FLOW_OFF; | 129 | u8 flow_off = SRVL_FLOW_OFF; |
132 | pkt = cfpkt_create(SRVL_CTRL_PKT_SIZE); | 130 | pkt = cfpkt_create(SRVL_CTRL_PKT_SIZE); |
133 | if (!pkt) { | 131 | if (!pkt) |
134 | pr_warn("Out of memory\n"); | ||
135 | return -ENOMEM; | 132 | return -ENOMEM; |
136 | } | ||
137 | 133 | ||
138 | if (cfpkt_add_head(pkt, &flow_off, 1) < 0) { | 134 | if (cfpkt_add_head(pkt, &flow_off, 1) < 0) { |
139 | pr_err("Packet is erroneous!\n"); | 135 | pr_err("Packet is erroneous!\n"); |