wireless: 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.
Convert kmalloc's with multiplies to kmalloc_array.
Remove now unused variables.
Remove unnecessary memset after kzalloc->kcalloc.
Whitespace cleanups for these changes.

Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 5 insertions, 11 deletions

diff --git a/drivers/net/wireless/orinoco/main.c b/drivers/net/wireless/orinoco/main.c
index 1e802f82ae49..38ec8d19ac29 100644
--- a/drivers/net/wireless/orinoco/main.c
+++ b/drivers/net/wireless/orinoco/main.c
@@ -853,12 +853,8 @@ void __orinoco_ev_rx(struct net_device *dev, struct hermes *hw)
         int err;
 
         desc = kmalloc(sizeof(*desc), GFP_ATOMIC);
-        if (!desc) {
-                printk(KERN_WARNING
-                       "%s: Can't allocate space for RX descriptor\n",
-                       dev->name);
+        if (!desc)
                 goto update_stats;
-        }
 
         rxfid = hermes_read_regn(hw, RXFID);
 
@@ -1336,10 +1332,9 @@ static void qbuf_scan(struct orinoco_private *priv, void *buf,
         unsigned long flags;
 
         sd = kmalloc(sizeof(*sd), GFP_ATOMIC);
-        if (!sd) {
-                printk(KERN_ERR "%s: failed to alloc memory\n", __func__);
+        if (!sd)
                 return;
-        }
+
         sd->buf = buf;
         sd->len = len;
         sd->type = type;
@@ -1357,10 +1352,9 @@ static void qabort_scan(struct orinoco_private *priv)
         unsigned long flags;
 
         sd = kmalloc(sizeof(*sd), GFP_ATOMIC);
-        if (!sd) {
-                printk(KERN_ERR "%s: failed to alloc memory\n", __func__);
+        if (!sd)
                 return;
-        }
+
         sd->len = -1; /* Abort */
 
         spin_lock_irqsave(&priv->scan_lock, flags);