wimax: Remove unnecessary alloc/OOM messages, alloc cleanups

alloc failures already get standardized OOM
messages and a dump_stack.

Convert kzalloc's with multiplies to kcalloc.
Remove now unused size variables.

Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Joe Perches 2013-02-03 17:28:13 +00:00 committed by David S. Miller
parent 1d5d1fdc52
commit 9d11bd1592
2 changed files with 5 additions and 12 deletions

View File

@ -1351,24 +1351,18 @@ int i2400m_rx_setup(struct i2400m *i2400m)
i2400m->rx_reorder = i2400m_rx_reorder_disabled? 0 : 1;
if (i2400m->rx_reorder) {
unsigned itr;
size_t size;
struct i2400m_roq_log *rd;
result = -ENOMEM;
size = sizeof(i2400m->rx_roq[0]) * (I2400M_RO_CIN + 1);
i2400m->rx_roq = kzalloc(size, GFP_KERNEL);
if (i2400m->rx_roq == NULL) {
dev_err(dev, "RX: cannot allocate %zu bytes for "
"reorder queues\n", size);
i2400m->rx_roq = kcalloc(I2400M_RO_CIN + 1,
sizeof(i2400m->rx_roq[0]), GFP_KERNEL);
if (i2400m->rx_roq == NULL)
goto error_roq_alloc;
}
size = sizeof(*i2400m->rx_roq[0].log) * (I2400M_RO_CIN + 1);
rd = kzalloc(size, GFP_KERNEL);
rd = kcalloc(I2400M_RO_CIN + 1, sizeof(*i2400m->rx_roq[0].log),
GFP_KERNEL);
if (rd == NULL) {
dev_err(dev, "RX: cannot allocate %zu bytes for "
"reorder queues log areas\n", size);
result = -ENOMEM;
goto error_roq_log_alloc;
}

View File

@ -199,7 +199,6 @@ int i2400mu_notification_setup(struct i2400mu *i2400mu)
d_fnstart(4, dev, "(i2400m %p)\n", i2400mu);
buf = kmalloc(I2400MU_MAX_NOTIFICATION_LEN, GFP_KERNEL | GFP_DMA);
if (buf == NULL) {
dev_err(dev, "notification: buffer allocation failed\n");
ret = -ENOMEM;
goto error_buf_alloc;
}