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/cffrml.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/cffrml.c')
-rw-r--r-- | net/caif/cffrml.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/net/caif/cffrml.c b/net/caif/cffrml.c index 04204b202718..f39921171d0d 100644 --- a/net/caif/cffrml.c +++ b/net/caif/cffrml.c | |||
@@ -34,11 +34,9 @@ static u32 cffrml_rcv_error; | |||
34 | static u32 cffrml_rcv_checsum_error; | 34 | static u32 cffrml_rcv_checsum_error; |
35 | struct cflayer *cffrml_create(u16 phyid, bool use_fcs) | 35 | struct cflayer *cffrml_create(u16 phyid, bool use_fcs) |
36 | { | 36 | { |
37 | struct cffrml *this = kmalloc(sizeof(struct cffrml), GFP_ATOMIC); | 37 | struct cffrml *this = kzalloc(sizeof(struct cffrml), GFP_ATOMIC); |
38 | if (!this) { | 38 | if (!this) |
39 | pr_warn("Out of memory\n"); | ||
40 | return NULL; | 39 | return NULL; |
41 | } | ||
42 | this->pcpu_refcnt = alloc_percpu(int); | 40 | this->pcpu_refcnt = alloc_percpu(int); |
43 | if (this->pcpu_refcnt == NULL) { | 41 | if (this->pcpu_refcnt == NULL) { |
44 | kfree(this); | 42 | kfree(this); |
@@ -47,7 +45,6 @@ struct cflayer *cffrml_create(u16 phyid, bool use_fcs) | |||
47 | 45 | ||
48 | caif_assert(offsetof(struct cffrml, layer) == 0); | 46 | caif_assert(offsetof(struct cffrml, layer) == 0); |
49 | 47 | ||
50 | memset(this, 0, sizeof(struct cflayer)); | ||
51 | this->layer.receive = cffrml_receive; | 48 | this->layer.receive = cffrml_receive; |
52 | this->layer.transmit = cffrml_transmit; | 49 | this->layer.transmit = cffrml_transmit; |
53 | this->layer.ctrlcmd = cffrml_ctrlcmd; | 50 | this->layer.ctrlcmd = cffrml_ctrlcmd; |