drivers/net: Remove unnecessary k.alloc/v.alloc OOM messages
authorJoe Perches <joe@perches.com>
Sun, 29 Jan 2012 12:56:23 +0000 (12:56 +0000)
committerDavid S. Miller <davem@davemloft.net>
Tue, 31 Jan 2012 21:20:21 +0000 (16:20 -0500)
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>

60 files changed:
drivers/net/bonding/bond_alb.c
drivers/net/can/slcan.c
drivers/net/ethernet/amd/ni65.c
drivers/net/ethernet/apple/bmac.c
drivers/net/ethernet/apple/mace.c
drivers/net/ethernet/broadcom/bnx2.c
drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
drivers/net/ethernet/brocade/bna/bnad_debugfs.c
drivers/net/ethernet/cisco/enic/enic_main.c
drivers/net/ethernet/cisco/enic/vnic_rq.c
drivers/net/ethernet/cisco/enic/vnic_wq.c
drivers/net/ethernet/i825xx/lp486e.c
drivers/net/ethernet/ibm/emac/rgmii.c
drivers/net/ethernet/ibm/emac/tah.c
drivers/net/ethernet/ibm/emac/zmii.c
drivers/net/ethernet/intel/e1000/e1000_main.c
drivers/net/ethernet/intel/ixgb/ixgb_main.c
drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c
drivers/net/ethernet/korina.c
drivers/net/ethernet/marvell/pxa168_eth.c
drivers/net/ethernet/mellanox/mlx4/en_rx.c
drivers/net/ethernet/mellanox/mlx4/en_tx.c
drivers/net/ethernet/micrel/ks8851_mll.c
drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_main.c
drivers/net/ethernet/qlogic/netxen/netxen_nic_init.c
drivers/net/ethernet/qlogic/qlge/qlge_dbg.c
drivers/net/ethernet/sis/sis900.c
drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
drivers/net/ethernet/sun/cassini.c
drivers/net/ethernet/sun/sunvnet.c
drivers/net/ethernet/toshiba/ps3_gelic_wireless.c
drivers/net/hamradio/yam.c
drivers/net/hippi/rrunner.c
drivers/net/irda/donauboe.c
drivers/net/netconsole.c
drivers/net/ppp/pptp.c
drivers/net/slip/slip.c
drivers/net/tokenring/3c359.c
drivers/net/tokenring/madgemc.c
drivers/net/vmxnet3/vmxnet3_drv.c
drivers/net/wan/c101.c
drivers/net/wan/dscc4.c
drivers/net/wan/lmc/lmc_main.c
drivers/net/wan/n2.c
drivers/net/wan/pc300too.c
drivers/net/wan/pci200syn.c
drivers/net/wan/wanxl.c
drivers/net/wan/x25_asy.c
drivers/net/wireless/ath/ath9k/htc_hst.c
drivers/net/wireless/hostap/hostap_hw.c
drivers/net/wireless/ipw2x00/ipw2100.c
drivers/net/wireless/libertas/if_cs.c
drivers/net/wireless/libertas/if_usb.c
drivers/net/wireless/libertas_tf/if_usb.c
drivers/net/wireless/mwifiex/pcie.c
drivers/net/wireless/mwifiex/sdio.c
drivers/net/wireless/orinoco/main.c
drivers/net/wireless/prism54/islpci_mgt.c
drivers/net/wireless/rtlwifi/rtl8192se/sw.c
drivers/net/xen-netback/netback.c

index f820b26..9abfde4 100644 (file)
@@ -180,11 +180,9 @@ static int tlb_initialize(struct bonding *bond)
        int i;
 
        new_hashtbl = kzalloc(size, GFP_KERNEL);
-       if (!new_hashtbl) {
-               pr_err("%s: Error: Failed to allocate TLB hash table\n",
-                      bond->dev->name);
+       if (!new_hashtbl)
                return -1;
-       }
+
        _lock_tx_hashtbl_bh(bond);
 
        bond_info->tx_hashtbl = new_hashtbl;
@@ -784,11 +782,9 @@ static int rlb_initialize(struct bonding *bond)
        int i;
 
        new_hashtbl = kmalloc(size, GFP_KERNEL);
-       if (!new_hashtbl) {
-               pr_err("%s: Error: Failed to allocate RLB hash table\n",
-                      bond->dev->name);
+       if (!new_hashtbl)
                return -1;
-       }
+
        _lock_rx_hashtbl_bh(bond);
 
        bond_info->rx_hashtbl = new_hashtbl;
index 579e7fc..98a5a7d 100644 (file)
@@ -639,10 +639,8 @@ static int __init slcan_init(void)
        printk(KERN_INFO "slcan: %d dynamic interface channels.\n", maxdev);
 
        slcan_devs = kzalloc(sizeof(struct net_device *)*maxdev, GFP_KERNEL);
-       if (!slcan_devs) {
-               printk(KERN_ERR "slcan: can't allocate slcan device array!\n");
+       if (!slcan_devs)
                return -ENOMEM;
-       }
 
        /* Fill in our line protocol discipline, and register it */
        status = tty_register_ldisc(N_SLCAN, &slc_ldisc);
index 6e6aa72..735c213 100644 (file)
@@ -621,10 +621,8 @@ static void *ni65_alloc_mem(struct net_device *dev,char *what,int size,int type)
        }
        else {
                ret = ptr = kmalloc(T_BUF_SIZE,GFP_KERNEL | GFP_DMA);
-               if(!ret) {
-                       printk(KERN_WARNING "%s: unable to allocate %s memory.\n",dev->name,what);
+               if(!ret)
                        return NULL;
-               }
        }
        if( (u32) virt_to_phys(ptr+size) > 0x1000000) {
                printk(KERN_WARNING "%s: unable to allocate %s memory in lower 16MB!\n",dev->name,what);
index d070b22..4108ac8 100644 (file)
@@ -1660,10 +1660,8 @@ static int __init bmac_init(void)
 {
        if (bmac_emergency_rxbuf == NULL) {
                bmac_emergency_rxbuf = kmalloc(RX_BUFLEN, GFP_KERNEL);
-               if (bmac_emergency_rxbuf == NULL) {
-                       printk(KERN_ERR "BMAC: can't allocate emergency RX buffer\n");
+               if (bmac_emergency_rxbuf == NULL)
                        return -ENOMEM;
-               }
        }
 
        return macio_register_driver(&bmac_driver);
index bec87bd..45ba18e 100644 (file)
@@ -136,10 +136,8 @@ static int __devinit mace_probe(struct macio_dev *mdev, const struct of_device_i
         */
        if (dummy_buf == NULL) {
                dummy_buf = kmalloc(RX_BUFLEN+2, GFP_KERNEL);
-               if (dummy_buf == NULL) {
-                       printk(KERN_ERR "MACE: couldn't allocate dummy buffer\n");
+               if (dummy_buf == NULL)
                        return -ENOMEM;
-               }
        }
 
        if (macio_request_resources(mdev, "mace")) {
index 021fb81..0a4c540 100644 (file)
@@ -2625,10 +2625,8 @@ bnx2_alloc_bad_rbuf(struct bnx2 *bp)
        u32 val;
 
        good_mbuf = kmalloc(512 * sizeof(u16), GFP_KERNEL);
-       if (good_mbuf == NULL) {
-               pr_err("Failed to allocate memory in %s\n", __func__);
+       if (good_mbuf == NULL)
                return -ENOMEM;
-       }
 
        REG_WR(bp, BNX2_MISC_ENABLE_SET_BITS,
                BNX2_MISC_ENABLE_SET_BITS_RX_MBUF_ENABLE);
index fea9615..582cbcf 100644 (file)
@@ -10894,10 +10894,8 @@ static inline void be16_to_cpu_n(const u8 *_source, u8 *_target, u32 n)
 do {                                                                   \
        u32 len = be32_to_cpu(fw_hdr->arr.len);                         \
        bp->arr = kmalloc(len, GFP_KERNEL);                             \
-       if (!bp->arr) {                                                 \
-               pr_err("Failed to allocate %d bytes for "#arr"\n", len); \
+       if (!bp->arr)                                                   \
                goto lbl;                                               \
-       }                                                               \
        func(bp->firmware->data + be32_to_cpu(fw_hdr->arr.offset),      \
             (u8 *)bp->arr, len);                                       \
 } while (0)
index 592ad39..c9fdceb 100644 (file)
@@ -62,8 +62,6 @@ bnad_debugfs_open_fwtrc(struct inode *inode, struct file *file)
        if (!fw_debug->debug_buffer) {
                kfree(fw_debug);
                fw_debug = NULL;
-               pr_warn("bna %s: Failed to allocate fwtrc buffer\n",
-                       pci_name(bnad->pcidev));
                return -ENOMEM;
        }
 
@@ -105,8 +103,6 @@ bnad_debugfs_open_fwsave(struct inode *inode, struct file *file)
        if (!fw_debug->debug_buffer) {
                kfree(fw_debug);
                fw_debug = NULL;
-               pr_warn("bna %s: Failed to allocate fwsave buffer\n",
-                       pci_name(bnad->pcidev));
                return -ENOMEM;
        }
 
@@ -208,8 +204,6 @@ bnad_debugfs_open_drvinfo(struct inode *inode, struct file *file)
        if (!drv_info->debug_buffer) {
                kfree(drv_info);
                drv_info = NULL;
-               pr_warn("bna %s: Failed to allocate drv info buffer\n",
-                       pci_name(bnad->pcidev));
                return -ENOMEM;
        }
 
@@ -348,11 +342,8 @@ bnad_debugfs_write_regrd(struct file *file, const char __user *buf,
 
        /* Allocate memory to store the user space buf */
        kern_buf = kzalloc(nbytes, GFP_KERNEL);
-       if (!kern_buf) {
-               pr_warn("bna %s: Failed to allocate user buffer\n",
-                       pci_name(bnad->pcidev));
+       if (!kern_buf)
                return -ENOMEM;
-       }
 
        if (copy_from_user(kern_buf, (void  __user *)buf, nbytes)) {
                kfree(kern_buf);
@@ -373,11 +364,8 @@ bnad_debugfs_write_regrd(struct file *file, const char __user *buf,
        bnad->reglen = 0;
 
        bnad->regdata = kzalloc(len << 2, GFP_KERNEL);
-       if (!bnad->regdata) {
-               pr_warn("bna %s: Failed to allocate regrd buffer\n",
-                       pci_name(bnad->pcidev));
+       if (!bnad->regdata)
                return -ENOMEM;
-       }
 
        bnad->reglen = len << 2;
        rb = bfa_ioc_bar0(ioc);
@@ -421,11 +409,8 @@ bnad_debugfs_write_regwr(struct file *file, const char __user *buf,
 
        /* Allocate memory to store the user space buf */
        kern_buf = kzalloc(nbytes, GFP_KERNEL);
-       if (!kern_buf) {
-               pr_warn("bna %s: Failed to allocate user buffer\n",
-                       pci_name(bnad->pcidev));
+       if (!kern_buf)
                return -ENOMEM;
-       }
 
        if (copy_from_user(kern_buf, (void  __user *)buf, nbytes)) {
                kfree(kern_buf);
index ab3f67f..07df137 100644 (file)
@@ -2388,7 +2388,6 @@ static int __devinit enic_probe(struct pci_dev *pdev,
        /* Allocate structure for port profiles */
        enic->pp = kcalloc(num_pps, sizeof(*enic->pp), GFP_KERNEL);
        if (!enic->pp) {
-               pr_err("port profile alloc failed, aborting\n");
                err = -ENOMEM;
                goto err_out_disable_sriov_pp;
        }
index 34105e0..7e1488f 100644 (file)
@@ -38,10 +38,8 @@ static int vnic_rq_alloc_bufs(struct vnic_rq *rq)
 
        for (i = 0; i < blks; i++) {
                rq->bufs[i] = kzalloc(VNIC_RQ_BUF_BLK_SZ(count), GFP_ATOMIC);
-               if (!rq->bufs[i]) {
-                       pr_err("Failed to alloc rq_bufs\n");
+               if (!rq->bufs[i])
                        return -ENOMEM;
-               }
        }
 
        for (i = 0; i < blks; i++) {
index df61bd9..5e0d7a2 100644 (file)
@@ -38,10 +38,8 @@ static int vnic_wq_alloc_bufs(struct vnic_wq *wq)
 
        for (i = 0; i < blks; i++) {
                wq->bufs[i] = kzalloc(VNIC_WQ_BUF_BLK_SZ(count), GFP_ATOMIC);
-               if (!wq->bufs[i]) {
-                       pr_err("Failed to alloc wq_bufs\n");
+               if (!wq->bufs[i])
                        return -ENOMEM;
-               }
        }
 
        for (i = 0; i < blks; i++) {
index 414044b..02df5f5 100644 (file)
@@ -454,8 +454,6 @@ init_rx_bufs(struct net_device *dev, int num) {
                        }
 
                        rfd->rbd = rbd;
-               } else {
-                       printk("Could not kmalloc rbd\n");
                }
        }
        lp->rbd_tail->next = rfd->rbd;
index 05484f9..d312328 100644 (file)
@@ -237,11 +237,8 @@ static int __devinit rgmii_probe(struct platform_device *ofdev)
 
        rc = -ENOMEM;
        dev = kzalloc(sizeof(struct rgmii_instance), GFP_KERNEL);
-       if (dev == NULL) {
-               printk(KERN_ERR "%s: could not allocate RGMII device!\n",
-                      np->full_name);
+       if (dev == NULL)
                goto err_gone;
-       }
 
        mutex_init(&dev->lock);
        dev->ofdev = ofdev;
index 0d9881e..872912e 100644 (file)
@@ -96,11 +96,8 @@ static int __devinit tah_probe(struct platform_device *ofdev)
 
        rc = -ENOMEM;
        dev = kzalloc(sizeof(struct tah_instance), GFP_KERNEL);
-       if (dev == NULL) {
-               printk(KERN_ERR "%s: could not allocate TAH device!\n",
-                      np->full_name);
+       if (dev == NULL)
                goto err_gone;
-       }
 
        mutex_init(&dev->lock);
        dev->ofdev = ofdev;
index e799a61..415e9b4 100644 (file)
@@ -240,11 +240,8 @@ static int __devinit zmii_probe(struct platform_device *ofdev)
 
        rc = -ENOMEM;
        dev = kzalloc(sizeof(struct zmii_instance), GFP_KERNEL);
-       if (dev == NULL) {
-               printk(KERN_ERR "%s: could not allocate ZMII device!\n",
-                      np->full_name);
+       if (dev == NULL)
                goto err_gone;
-       }
 
        mutex_init(&dev->lock);
        dev->ofdev = ofdev;
index 669ca38..363fd39 100644 (file)
@@ -730,10 +730,8 @@ static void e1000_dump_eeprom(struct e1000_adapter *adapter)
        eeprom.offset = 0;
 
        data = kmalloc(eeprom.len, GFP_KERNEL);
-       if (!data) {
-               pr_err("Unable to allocate memory to dump EEPROM data\n");
+       if (!data)
                return;
-       }
 
        ops->get_eeprom(netdev, &eeprom, data);
 
index 9bd5faf..0024788 100644 (file)
@@ -1136,10 +1136,8 @@ ixgb_set_multi(struct net_device *netdev)
                u8 *mta = kmalloc(IXGB_MAX_NUM_MULTICAST_ADDRESSES *
                              ETH_ALEN, GFP_ATOMIC);
                u8 *addr;
-               if (!mta) {
-                       pr_err("allocation of multicast memory failed\n");
+               if (!mta)
                        goto alloc_failed;
-               }
 
                IXGB_WRITE_REG(hw, RCTL, rctl);
 
index bed411b..f3bc933 100644 (file)
@@ -2517,12 +2517,8 @@ int ixgbevf_setup_rx_resources(struct ixgbevf_adapter *adapter,
 
        size = sizeof(struct ixgbevf_rx_buffer) * rx_ring->count;
        rx_ring->rx_buffer_info = vzalloc(size);
-       if (!rx_ring->rx_buffer_info) {
-               hw_dbg(&adapter->hw,
-                      "Unable to vmalloc buffer memory for "
-                      "the receive descriptor ring\n");
+       if (!rx_ring->rx_buffer_info)
                goto alloc_failed;
-       }
 
        /* Round up to nearest 4K */
        rx_ring->size = rx_ring->count * sizeof(union ixgbe_adv_rx_desc);
index 6ad094f..341d101 100644 (file)
@@ -1150,7 +1150,6 @@ static int korina_probe(struct platform_device *pdev)
 
        lp->td_ring = kmalloc(TD_RING_SIZE + RD_RING_SIZE, GFP_KERNEL);
        if (!lp->td_ring) {
-               printk(KERN_ERR DRV_NAME ": cannot allocate descriptors\n");
                rc = -ENXIO;
                goto probe_err_td_ring;
        }
index 953ba58..92b4b4e 100644 (file)
@@ -1017,10 +1017,9 @@ static int rxq_init(struct net_device *dev)
        /* Allocate RX skb rings */
        pep->rx_skb = kmalloc(sizeof(*pep->rx_skb) * pep->rx_ring_size,
                             GFP_KERNEL);
-       if (!pep->rx_skb) {
-               printk(KERN_ERR "%s: Cannot alloc RX skb ring\n", dev->name);
+       if (!pep->rx_skb)
                return -ENOMEM;
-       }
+
        /* Allocate RX ring */
        pep->rx_desc_count = 0;
        size = pep->rx_ring_size * sizeof(struct rx_desc);
@@ -1081,10 +1080,9 @@ static int txq_init(struct net_device *dev)
 
        pep->tx_skb = kmalloc(sizeof(*pep->tx_skb) * pep->tx_ring_size,
                             GFP_KERNEL);
-       if (!pep->tx_skb) {
-               printk(KERN_ERR "%s: Cannot alloc TX skb ring\n", dev->name);
+       if (!pep->tx_skb)
                return -ENOMEM;
-       }
+
        /* Allocate TX ring */
        pep->tx_desc_count = 0;
        size = pep->tx_ring_size * sizeof(struct tx_desc);
index 971d4b6..f61d0e0 100644 (file)
@@ -281,10 +281,9 @@ int mlx4_en_create_rx_ring(struct mlx4_en_priv *priv,
        tmp = size * roundup_pow_of_two(MLX4_EN_MAX_RX_FRAGS *
                                        sizeof(struct skb_frag_struct));
        ring->rx_info = vmalloc(tmp);
-       if (!ring->rx_info) {
-               en_err(priv, "Failed allocating rx_info ring\n");
+       if (!ring->rx_info)
                return -ENOMEM;
-       }
+
        en_dbg(DRV, priv, "Allocated rx_info ring at addr:%p size:%d\n",
                 ring->rx_info, tmp);
 
index 9ef9038..ff32505 100644 (file)
@@ -71,16 +71,14 @@ int mlx4_en_create_tx_ring(struct mlx4_en_priv *priv,
 
        tmp = size * sizeof(struct mlx4_en_tx_info);
        ring->tx_info = vmalloc(tmp);
-       if (!ring->tx_info) {
-               en_err(priv, "Failed allocating tx_info ring\n");
+       if (!ring->tx_info)
                return -ENOMEM;
-       }
+
        en_dbg(DRV, priv, "Allocated tx_info ring at addr:%p size:%d\n",
                 ring->tx_info, tmp);
 
        ring->bounce_buf = kmalloc(MAX_DESC_SIZE, GFP_KERNEL);
        if (!ring->bounce_buf) {
-               en_err(priv, "Failed allocating bounce buffer\n");
                err = -ENOMEM;
                goto err_tx;
        }
index a37264e..4a9d57f 100644 (file)
@@ -1501,10 +1501,8 @@ static int ks_hw_init(struct ks_net *ks)
        ks->mcast_lst_size = 0;
 
        ks->frame_head_info = kmalloc(MHEADER_SIZE, GFP_KERNEL);
-       if (!ks->frame_head_info) {
-               pr_err("Error: Fail to allocate frame memory\n");
+       if (!ks->frame_head_info)
                return false;
-       }
 
        ks_set_mac(ks, KS_DEFAULT_MAC_ADDRESS);
        return true;
index 3ead111..0217991 100644 (file)
@@ -1587,10 +1587,8 @@ int pch_gbe_setup_tx_resources(struct pch_gbe_adapter *adapter,
 
        size = (int)sizeof(struct pch_gbe_buffer) * tx_ring->count;
        tx_ring->buffer_info = vzalloc(size);
-       if (!tx_ring->buffer_info) {
-               pr_err("Unable to allocate memory for the buffer information\n");
+       if (!tx_ring->buffer_info)
                return -ENOMEM;
-       }
 
        tx_ring->size = tx_ring->count * (int)sizeof(struct pch_gbe_tx_desc);
 
@@ -1636,10 +1634,9 @@ int pch_gbe_setup_rx_resources(struct pch_gbe_adapter *adapter,
 
        size = (int)sizeof(struct pch_gbe_buffer) * rx_ring->count;
        rx_ring->buffer_info = vzalloc(size);
-       if (!rx_ring->buffer_info) {
-               pr_err("Unable to allocate memory for the receive descriptor ring\n");
+       if (!rx_ring->buffer_info)
                return -ENOMEM;
-       }
+
        rx_ring->size = rx_ring->count * (int)sizeof(struct pch_gbe_rx_desc);
        rx_ring->desc = dma_alloc_coherent(&pdev->dev, rx_ring->size,
                                           &rx_ring->dma, GFP_KERNEL);
index a8259cc..094d26c 100644 (file)
@@ -280,13 +280,10 @@ int netxen_alloc_sw_resources(struct netxen_adapter *adapter)
 
                }
                rds_ring->rx_buf_arr = vzalloc(RCV_BUFF_RINGSIZE(rds_ring));
-               if (rds_ring->rx_buf_arr == NULL) {
-                       printk(KERN_ERR "%s: Failed to allocate "
-                               "rx buffer ring %d\n",
-                               netdev->name, ring);
+               if (rds_ring->rx_buf_arr == NULL)
                        /* free whatever was already allocated */
                        goto err_out;
-               }
+
                INIT_LIST_HEAD(&rds_ring->free_list);
                /*
                 * Now go through all of them, set reference handles
@@ -480,11 +477,8 @@ int netxen_pinit_from_rom(struct netxen_adapter *adapter)
        }
 
        buf = kcalloc(n, sizeof(struct crb_addr_pair), GFP_KERNEL);
-       if (buf == NULL) {
-               printk("%s: netxen_pinit_from_rom: Unable to calloc memory.\n",
-                               netxen_nic_driver_name);
+       if (buf == NULL)
                return -ENOMEM;
-       }
 
        for (i = 0; i < n; i++) {
                if (netxen_rom_fast_read(adapter, 8*i + 4*offset, &val) != 0 ||
index fca804f..58185b6 100644 (file)
@@ -1824,10 +1824,8 @@ void ql_dump_hw_cb(struct ql_adapter *qdev, int size, u32 bit, u16 q_id)
        pr_err("%s: Enter\n", __func__);
 
        ptr = kmalloc(size, GFP_ATOMIC);
-       if (ptr == NULL) {
-               pr_err("%s: Couldn't allocate a buffer\n", __func__);
+       if (ptr == NULL)
                return;
-       }
 
        if (ql_write_cfg(qdev, ptr, size, bit, q_id)) {
                pr_err("%s: Failed to upload control block!\n", __func__);
index c8efc70..91c4468 100644 (file)
@@ -619,7 +619,6 @@ static int __devinit sis900_mii_probe(struct net_device * net_dev)
                }
 
                if ((mii_phy = kmalloc(sizeof(struct mii_phy), GFP_KERNEL)) == NULL) {
-                       printk(KERN_WARNING "Cannot allocate mem for struct mii_phy\n");
                        mii_phy = sis_priv->first_mii;
                        while (mii_phy) {
                                struct mii_phy *phy;
index 96fa2da..ffc7581 100644 (file)
@@ -954,10 +954,9 @@ static int stmmac_open(struct net_device *dev)
 
 #ifdef CONFIG_STMMAC_TIMER
        priv->tm = kzalloc(sizeof(struct stmmac_timer *), GFP_KERNEL);
-       if (unlikely(priv->tm == NULL)) {
-               pr_err("%s: ERROR: timer memory alloc failed\n", __func__);
+       if (unlikely(priv->tm == NULL))
                return -ENOMEM;
-       }
+
        priv->tm->freq = tmrate;
 
        /* Test if the external timer can be actually used.
index f10665f..46d84ab 100644 (file)
@@ -835,7 +835,6 @@ static int cas_saturn_firmware_init(struct cas *cp)
        cp->fw_data = vmalloc(cp->fw_size);
        if (!cp->fw_data) {
                err = -ENOMEM;
-               pr_err("\"%s\" Failed %d\n", fw_name, err);
                goto out;
        }
        memcpy(cp->fw_data, &fw->data[2], cp->fw_size);
index 8c6c059..2896f6e 100644 (file)
@@ -949,10 +949,9 @@ static int __devinit vnet_port_alloc_tx_bufs(struct vnet_port *port)
                int map_len = (ETH_FRAME_LEN + 7) & ~7;
 
                err = -ENOMEM;
-               if (!buf) {
-                       pr_err("TX buffer allocation failure\n");
+               if (!buf)
                        goto err_out;
-               }
+
                err = -EFAULT;
                if ((unsigned long)buf & (8UL - 1)) {
                        pr_err("TX buffer misaligned\n");
@@ -1165,10 +1164,8 @@ static int __devinit vnet_port_probe(struct vio_dev *vdev,
 
        port = kzalloc(sizeof(*port), GFP_KERNEL);
        err = -ENOMEM;
-       if (!port) {
-               pr_err("Cannot allocate vnet_port\n");
+       if (!port)
                goto err_out_put_mdesc;
-       }
 
        for (i = 0; i < ETH_ALEN; i++)
                port->raddr[i] = (*rmac >> (5 - i) * 8) & 0xff;
index fd4ed7f..5c14f82 100644 (file)
@@ -1621,10 +1621,9 @@ static void gelic_wl_scan_complete_event(struct gelic_wl_info *wl)
                kfree(target->hwinfo);
                target->hwinfo = kzalloc(be16_to_cpu(scan_info->size),
                                         GFP_KERNEL);
-               if (!target->hwinfo) {
-                       pr_info("%s: kzalloc failed\n", __func__);
+               if (!target->hwinfo)
                        continue;
-               }
+
                /* copy hw scan info */
                memcpy(target->hwinfo, scan_info, scan_info->size);
                target->essid_len = strnlen(scan_info->essid,
index 96a98d2..6963277 100644 (file)
@@ -403,7 +403,6 @@ static unsigned char *add_mcs(unsigned char *bits, int bitrate,
 
        /* Allocate a new mcs */
        if ((p = kmalloc(sizeof(struct yam_mcs), GFP_KERNEL)) == NULL) {
-               printk(KERN_WARNING "YAM: no memory to allocate mcs\n");
                release_firmware(fw);
                return NULL;
        }
index e68c941..2a51363 100644 (file)
@@ -1600,12 +1600,8 @@ static int rr_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
                }
 
                image = kmalloc(EEPROM_WORDS * sizeof(u32), GFP_KERNEL);
-               if (!image){
-                       printk(KERN_ERR "%s: Unable to allocate memory "
-                              "for EEPROM image\n", dev->name);
+               if (!image)
                        return -ENOMEM;
-               }
-
 
                if (rrpriv->fw_running){
                        printk("%s: Firmware already running\n", dev->name);
@@ -1637,8 +1633,6 @@ static int rr_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
                image = kmalloc(EEPROM_WORDS * sizeof(u32), GFP_KERNEL);
                oldimage = kmalloc(EEPROM_WORDS * sizeof(u32), GFP_KERNEL);
                if (!image || !oldimage) {
-                       printk(KERN_ERR "%s: Unable to allocate memory "
-                              "for EEPROM image\n", dev->name);
                        error = -ENOMEM;
                        goto wf_out;
                }
index 64f403d..617a446 100644 (file)
@@ -1608,7 +1608,6 @@ toshoboe_open (struct pci_dev *pci_dev, const struct pci_device_id *pdid)
   self->ringbuf = kmalloc(OBOE_RING_LEN << 1, GFP_KERNEL);
   if (!self->ringbuf)
     {
-      printk (KERN_ERR DRIVER_NAME ": can't allocate DMA buffers\n");
       err = -ENOMEM;
       goto freeregion;
     }
@@ -1647,7 +1646,6 @@ toshoboe_open (struct pci_dev *pci_dev, const struct pci_device_id *pdid)
 
   if (!ok)
     {
-      printk (KERN_ERR DRIVER_NAME ": can't allocate rx/tx buffers\n");
       err = -ENOMEM;
       goto freebufs;
     }
index e888202..f9347ea 100644 (file)
@@ -169,10 +169,8 @@ static struct netconsole_target *alloc_param_target(char *target_config)
         * Note that these targets get their config_item fields zeroed-out.
         */
        nt = kzalloc(sizeof(*nt), GFP_KERNEL);
-       if (!nt) {
-               printk(KERN_ERR "netconsole: failed to allocate memory\n");
+       if (!nt)
                goto fail;
-       }
 
        nt->np.name = "netconsole";
        strlcpy(nt->np.dev_name, "eth0", IFNAMSIZ);
@@ -551,10 +549,8 @@ static struct config_item *make_netconsole_target(struct config_group *group,
         * Target is disabled at creation (enabled == 0).
         */
        nt = kzalloc(sizeof(*nt), GFP_KERNEL);
-       if (!nt) {
-               printk(KERN_ERR "netconsole: failed to allocate memory\n");
+       if (!nt)
                return ERR_PTR(-ENOMEM);
-       }
 
        nt->np.name = "netconsole";
        strlcpy(nt->np.dev_name, "eth0", IFNAMSIZ);
index df884dd..234cd9d 100644 (file)
@@ -670,10 +670,8 @@ static int __init pptp_init_module(void)
        pr_info("PPTP driver version " PPTP_DRIVER_VERSION "\n");
 
        callid_sock = vzalloc((MAX_CALLID + 1) * sizeof(void *));
-       if (!callid_sock) {
-               pr_err("PPTP: cann't allocate memory\n");
+       if (!callid_sock)
                return -ENOMEM;
-       }
 
        err = gre_add_protocol(&gre_pptp_protocol, GREPROTO_PPTP);
        if (err) {
index ba08341..69345df 100644 (file)
@@ -1296,10 +1296,8 @@ static int __init slip_init(void)
 
        slip_devs = kzalloc(sizeof(struct net_device *)*slip_maxdev,
                                                                GFP_KERNEL);
-       if (!slip_devs) {
-               printk(KERN_ERR "SLIP: Can't allocate slip devices array.\n");
+       if (!slip_devs)
                return -ENOMEM;
-       }
 
        /* Fill in our line protocol discipline, and register it */
        status = tty_register_ldisc(N_SLIP, &sl_ldisc);
index ef9fdf3..d7c292a 100644 (file)
@@ -674,15 +674,11 @@ static int xl_open(struct net_device *dev)
        /* These MUST be on 8 byte boundaries */
        xl_priv->xl_tx_ring = kzalloc((sizeof(struct xl_tx_desc) * XL_TX_RING_SIZE) + 7, GFP_DMA | GFP_KERNEL);
        if (xl_priv->xl_tx_ring == NULL) {
-               printk(KERN_WARNING "%s: Not enough memory to allocate tx buffers.\n",
-                                    dev->name);
                free_irq(dev->irq,dev);
                return -ENOMEM;
        }
        xl_priv->xl_rx_ring = kzalloc((sizeof(struct xl_rx_desc) * XL_RX_RING_SIZE) +7, GFP_DMA | GFP_KERNEL);
        if (xl_priv->xl_rx_ring == NULL) {
-               printk(KERN_WARNING "%s: Not enough memory to allocate rx buffers.\n",
-                                    dev->name);
                free_irq(dev->irq,dev);
                kfree(xl_priv->xl_tx_ring);
                return -ENOMEM;
index 6153cfd..1cdc034 100644 (file)
@@ -171,7 +171,6 @@ static int __devinit madgemc_probe(struct device *device)
 
        card = kmalloc(sizeof(struct card_info), GFP_KERNEL);
        if (card==NULL) {
-               printk("madgemc: unable to allocate card struct\n");
                ret = -ENOMEM;
                goto getout1;
        }
index be6aa35..87c0b58 100644 (file)
@@ -537,11 +537,8 @@ vmxnet3_tq_create(struct vmxnet3_tx_queue *tq,
 
        tq->buf_info = kcalloc(tq->tx_ring.size, sizeof(tq->buf_info[0]),
                               GFP_KERNEL);
-       if (!tq->buf_info) {
-               printk(KERN_ERR "%s: failed to allocate tx bufinfo\n",
-                      adapter->netdev->name);
+       if (!tq->buf_info)
                goto err;
-       }
 
        return 0;
 
@@ -1519,11 +1516,9 @@ vmxnet3_rq_create(struct vmxnet3_rx_queue *rq, struct vmxnet3_adapter *adapter)
        sz = sizeof(struct vmxnet3_rx_buf_info) * (rq->rx_ring[0].size +
                                                   rq->rx_ring[1].size);
        bi = kzalloc(sz, GFP_KERNEL);
-       if (!bi) {
-               printk(KERN_ERR "%s: failed to allocate rx bufinfo\n",
-                      adapter->netdev->name);
+       if (!bi)
                goto err;
-       }
+
        rq->buf_info[0] = bi;
        rq->buf_info[1] = bi + rq->rx_ring[0].size;
 
@@ -2964,8 +2959,6 @@ vmxnet3_probe_device(struct pci_dev *pdev,
 
        adapter->pm_conf = kmalloc(sizeof(struct Vmxnet3_PMConf), GFP_KERNEL);
        if (adapter->pm_conf == NULL) {
-               printk(KERN_ERR "Failed to allocate memory for %s\n",
-                       pci_name(pdev));
                err = -ENOMEM;
                goto err_alloc_pm;
        }
@@ -2974,8 +2967,6 @@ vmxnet3_probe_device(struct pci_dev *pdev,
 
        adapter->rss_conf = kmalloc(sizeof(struct UPT1_RSSConf), GFP_KERNEL);
        if (adapter->rss_conf == NULL) {
-               printk(KERN_ERR "Failed to allocate memory for %s\n",
-                      pci_name(pdev));
                err = -ENOMEM;
                goto err_alloc_rss;
        }
index 54f995f..09a5075 100644 (file)
@@ -325,10 +325,8 @@ static int __init c101_run(unsigned long irq, unsigned long winbase)
        }
 
        card = kzalloc(sizeof(card_t), GFP_KERNEL);
-       if (card == NULL) {
-               pr_err("unable to allocate memory\n");
+       if (card == NULL)
                return -ENOBUFS;
-       }
 
        card->dev = alloc_hdlcdev(card);
        if (!card->dev) {
index 058e169..fe8d060 100644 (file)
@@ -903,10 +903,8 @@ static int dscc4_found1(struct pci_dev *pdev, void __iomem *ioaddr)
        int i, ret = -ENOMEM;
 
        root = kcalloc(dev_per_card, sizeof(*root), GFP_KERNEL);
-       if (!root) {
-               pr_err("can't allocate data\n");
+       if (!root)
                goto err_out;
-       }
 
        for (i = 0; i < dev_per_card; i++) {
                root[i].dev = alloc_hdlcdev(root + i);
@@ -915,10 +913,8 @@ static int dscc4_found1(struct pci_dev *pdev, void __iomem *ioaddr)
        }
 
        ppriv = kzalloc(sizeof(*ppriv), GFP_KERNEL);
-       if (!ppriv) {
-               pr_err("can't allocate private data\n");
+       if (!ppriv)
                goto err_free_dev;
-       }
 
        ppriv->root = root;
        spin_lock_init(&ppriv->lock);
index b7f2358..76a8a4a 100644 (file)
@@ -497,7 +497,6 @@ int lmc_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd) /*fold00*/
 
                     data = kmalloc(xc.len, GFP_KERNEL);
                     if (!data) {
-                            printk(KERN_WARNING "%s: Failed to allocate memory for copy\n", dev->name);
                             ret = -ENOMEM;
                             break;
                     }
index 5129ad5..315bf09 100644 (file)
@@ -358,10 +358,8 @@ static int __init n2_run(unsigned long io, unsigned long irq,
        }
 
        card = kzalloc(sizeof(card_t), GFP_KERNEL);
-       if (card == NULL) {
-               pr_err("unable to allocate memory\n");
+       if (card == NULL)
                return -ENOBUFS;
-       }
 
        card->ports[0].dev = alloc_hdlcdev(&card->ports[0]);
        card->ports[1].dev = alloc_hdlcdev(&card->ports[1]);
index c49c1b3..5fe246e 100644 (file)
@@ -320,7 +320,6 @@ static int __devinit pc300_pci_init_one(struct pci_dev *pdev,
 
        card = kzalloc(sizeof(card_t), GFP_KERNEL);
        if (card == NULL) {
-               pr_err("unable to allocate memory\n");
                pci_release_regions(pdev);
                pci_disable_device(pdev);
                return -ENOBUFS;
index 1ce2116..9659fca 100644 (file)
@@ -299,7 +299,6 @@ static int __devinit pci200_pci_init_one(struct pci_dev *pdev,
 
        card = kzalloc(sizeof(card_t), GFP_KERNEL);
        if (card == NULL) {
-               pr_err("unable to allocate memory\n");
                pci_release_regions(pdev);
                pci_disable_device(pdev);
                return -ENOBUFS;
index 44b7071..feb7541 100644 (file)
@@ -604,7 +604,6 @@ static int __devinit wanxl_pci_init_one(struct pci_dev *pdev,
        alloc_size = sizeof(card_t) + ports * sizeof(port_t);
        card = kzalloc(alloc_size, GFP_KERNEL);
        if (card == NULL) {
-               pr_err("%s: unable to allocate memory\n", pci_name(pdev));
                pci_release_regions(pdev);
                pci_disable_device(pdev);
                return -ENOBUFS;
index 8a10bb7..e862369 100644 (file)
@@ -786,10 +786,8 @@ static int __init init_x25_asy(void)
 
        x25_asy_devs = kcalloc(x25_asy_maxdev, sizeof(struct net_device *),
                                GFP_KERNEL);
-       if (!x25_asy_devs) {
-               pr_warn("Can't allocate x25_asy_ctrls[] array! Uaargh! (-> No X.25 available)\n");
+       if (!x25_asy_devs)
                return -ENOMEM;
-       }
 
        return tty_register_ldisc(N_X25, &x25_ldisc);
 }
index 1b90ed8..c25226a 100644 (file)
@@ -431,11 +431,8 @@ struct htc_target *ath9k_htc_hw_alloc(void *hif_handle,
        struct htc_target *target;
 
        target = kzalloc(sizeof(struct htc_target), GFP_KERNEL);
-       if (!target) {
-               printk(KERN_ERR "Unable to allocate memory for"
-                       "target device\n");
+       if (!target)
                return NULL;
-       }
 
        init_completion(&target->target_wait);
        init_completion(&target->cmd_wait);
index a8bddd8..aa15cc4 100644 (file)
@@ -347,11 +347,9 @@ static int hfa384x_cmd(struct net_device *dev, u16 cmd, u16 param0,
                return -EINTR;
 
        entry = kzalloc(sizeof(*entry), GFP_ATOMIC);
-       if (entry == NULL) {
-               printk(KERN_DEBUG "%s: hfa384x_cmd - kmalloc failed\n",
-                      dev->name);
+       if (entry == NULL)
                return -ENOMEM;
-       }
+
        atomic_set(&entry->usecnt, 1);
        entry->type = CMD_SLEEP;
        entry->cmd = cmd;
@@ -515,11 +513,9 @@ static int hfa384x_cmd_callback(struct net_device *dev, u16 cmd, u16 param0,
        }
 
        entry = kzalloc(sizeof(*entry), GFP_ATOMIC);
-       if (entry == NULL) {
-               printk(KERN_DEBUG "%s: hfa384x_cmd_callback - kmalloc "
-                      "failed\n", dev->name);
+       if (entry == NULL)
                return -ENOMEM;
-       }
+
        atomic_set(&entry->usecnt, 1);
        entry->type = CMD_CALLBACK;
        entry->cmd = cmd;
@@ -2978,11 +2974,9 @@ static int prism2_set_tim(struct net_device *dev, int aid, int set)
        local = iface->local;
 
        new_entry = kzalloc(sizeof(*new_entry), GFP_ATOMIC);
-       if (new_entry == NULL) {
-               printk(KERN_DEBUG "%s: prism2_set_tim: kmalloc failed\n",
-                      local->dev->name);
+       if (new_entry == NULL)
                return -ENOMEM;
-       }
+
        new_entry->aid = aid;
        new_entry->set = set;
 
index a0e5c21..e847737 100644 (file)
@@ -3464,11 +3464,8 @@ static int ipw2100_msg_allocate(struct ipw2100_priv *priv)
        priv->msg_buffers =
            kmalloc(IPW_COMMAND_POOL_SIZE * sizeof(struct ipw2100_tx_packet),
                    GFP_KERNEL);
-       if (!priv->msg_buffers) {
-               printk(KERN_ERR DRV_NAME ": %s: PCI alloc failed for msg "
-                      "buffers.\n", priv->net_dev->name);
+       if (!priv->msg_buffers)
                return -ENOMEM;
-       }
 
        for (i = 0; i < IPW_COMMAND_POOL_SIZE; i++) {
                v = pci_alloc_consistent(priv->pci_dev,
index 3f7bf4d..234ee88 100644 (file)
@@ -815,10 +815,9 @@ static int if_cs_probe(struct pcmcia_device *p_dev)
        lbs_deb_enter(LBS_DEB_CS);
 
        card = kzalloc(sizeof(struct if_cs_card), GFP_KERNEL);
-       if (!card) {
-               pr_err("error in kzalloc\n");
+       if (!card)
                goto out;
-       }
+
        card->p_dev = p_dev;
        p_dev->priv = card;
 
index b5fbbc7..74da5f1 100644 (file)
@@ -261,10 +261,8 @@ static int if_usb_probe(struct usb_interface *intf,
        udev = interface_to_usbdev(intf);
 
        cardp = kzalloc(sizeof(struct if_usb_card), GFP_KERNEL);
-       if (!cardp) {
-               pr_err("Out of memory allocating private data\n");
+       if (!cardp)
                goto error;
-       }
 
        setup_timer(&cardp->fw_timeout, if_usb_fw_timeo, (unsigned long)cardp);
        init_waitqueue_head(&cardp->fw_wq);
index aff8b57..7ced130 100644 (file)
@@ -153,10 +153,8 @@ static int if_usb_probe(struct usb_interface *intf,
        udev = interface_to_usbdev(intf);
 
        cardp = kzalloc(sizeof(struct if_usb_card), GFP_KERNEL);
-       if (!cardp) {
-               pr_err("Out of memory allocating private data.\n");
+       if (!cardp)
                goto error;
-       }
 
        setup_timer(&cardp->fw_timeout, if_usb_fw_timeo, (unsigned long)cardp);
        init_waitqueue_head(&cardp->fw_wq);
index 4053509..f4fbad9 100644 (file)
@@ -86,10 +86,8 @@ static int mwifiex_pcie_probe(struct pci_dev *pdev,
                                pdev->vendor, pdev->device, pdev->revision);
 
        card = kzalloc(sizeof(struct pcie_service_card), GFP_KERNEL);
-       if (!card) {
-               pr_err("%s: failed to alloc memory\n", __func__);
+       if (!card)
                return -ENOMEM;
-       }
 
        card->dev = pdev;
 
index d39d845..8359027 100644 (file)
@@ -70,10 +70,8 @@ mwifiex_sdio_probe(struct sdio_func *func, const struct sdio_device_id *id)
               func->vendor, func->device, func->class, func->num);
 
        card = kzalloc(sizeof(struct sdio_mmc_card), GFP_KERNEL);
-       if (!card) {
-               pr_err("%s: failed to alloc memory\n", __func__);
+       if (!card)
                return -ENOMEM;
-       }
 
        card->func = func;
 
index 9fb77d0..dd6c64a 100644 (file)
@@ -941,11 +941,9 @@ void __orinoco_ev_rx(struct net_device *dev, struct hermes *hw)
 
        /* Add desc and skb to rx queue */
        rx_data = kzalloc(sizeof(*rx_data), GFP_ATOMIC);
-       if (!rx_data) {
-               printk(KERN_WARNING "%s: Can't allocate RX packet\n",
-                       dev->name);
+       if (!rx_data)
                goto drop;
-       }
+
        rx_data->desc = desc;
        rx_data->skb = skb;
        list_add_tail(&rx_data->list, &priv->rx_list);
index a5224f6..851fa10 100644 (file)
@@ -192,11 +192,9 @@ islpci_mgt_transmit(struct net_device *ndev, int operation, unsigned long oid,
 
        err = -ENOMEM;
        p = buf.mem = kmalloc(frag_len, GFP_KERNEL);
-       if (!buf.mem) {
-               printk(KERN_DEBUG "%s: cannot allocate mgmt frame\n",
-                      ndev->name);
+       if (!buf.mem)
                goto error;
-       }
+
        buf.size = frag_len;
 
        /* create the header directly in the fragment data area */
index 78723cf..36140cc 100644 (file)
@@ -186,11 +186,8 @@ static int rtl92s_init_sw_vars(struct ieee80211_hw *hw)
 
        /* for firmware buf */
        rtlpriv->rtlhal.pfirmware = vzalloc(sizeof(struct rt_firmware));
-       if (!rtlpriv->rtlhal.pfirmware) {
-               RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
-                        ("Can't alloc buffer for fw.\n"));
+       if (!rtlpriv->rtlhal.pfirmware)
                return 1;
-       }
 
        pr_info("Driver for Realtek RTL8192SE/RTL8191SE\n"
                "Loading firmware %s\n", rtlpriv->cfg->fw_name);
index 59effac..2596401 100644 (file)
@@ -1639,10 +1639,8 @@ static int __init netback_init(void)
 
        xen_netbk_group_nr = num_online_cpus();
        xen_netbk = vzalloc(sizeof(struct xen_netbk) * xen_netbk_group_nr);
-       if (!xen_netbk) {
-               printk(KERN_ALERT "%s: out of memory\n", __func__);
+       if (!xen_netbk)
                return -ENOMEM;
-       }
 
        for (group = 0; group < xen_netbk_group_nr; group++) {
                struct xen_netbk *netbk = &xen_netbk[group];