60 files changed, 77 insertions, 233 deletions

diff --git a/drivers/net/bonding/bond_alb.c b/drivers/net/bonding/bond_alb.c
index f820b26b9db3..9abfde479316 100644
--- a/drivers/net/bonding/bond_alb.c
+++ b/drivers/net/bonding/bond_alb.c
@@ -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;
diff --git a/drivers/net/can/slcan.c b/drivers/net/can/slcan.c
index 579e7fca6447..98a5a7d867f5 100644
--- a/drivers/net/can/slcan.c
+++ b/drivers/net/can/slcan.c
@@ -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);
diff --git a/drivers/net/ethernet/amd/ni65.c b/drivers/net/ethernet/amd/ni65.c
index 6e6aa7213aab..735c213798b1 100644
--- a/drivers/net/ethernet/amd/ni65.c
+++ b/drivers/net/ethernet/amd/ni65.c
@@ -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);
diff --git a/drivers/net/ethernet/apple/bmac.c b/drivers/net/ethernet/apple/bmac.c
index d070b229dbf7..4108ac800cf0 100644
--- a/drivers/net/ethernet/apple/bmac.c
+++ b/drivers/net/ethernet/apple/bmac.c
@@ -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);
diff --git a/drivers/net/ethernet/apple/mace.c b/drivers/net/ethernet/apple/mace.c
index bec87bd9195c..45ba18ee3d6a 100644
--- a/drivers/net/ethernet/apple/mace.c
+++ b/drivers/net/ethernet/apple/mace.c
@@ -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;
-                }
         }