Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-09-24 17:03:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

wan: Remove unnecessary alloc/OOM messages

Browse Source 
alloc failures already get standardized OOM
messages and a dump_stack.

Hoist assigns from if tests.

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:12 +00:00 committed by David S. Miller
parent 38673c8218
commit 1d5d1fdc52
4 changed files with 10 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
drivers/net/wan/cosa.c
View File

@ -795,8 +795,8 @@ static ssize_t cosa_read(struct file *file,
if (mutex_lock_interruptible(&chan->rlock)) if (mutex_lock_interruptible(&chan->rlock))
return -ERESTARTSYS; return -ERESTARTSYS;
if ((chan->rxdata = kmalloc(COSA_MTU, GFP_DMA|GFP_KERNEL)) == NULL) { chan->rxdata = kmalloc(COSA_MTU, GFP_DMA|GFP_KERNEL);
pr_info("%s: cosa_read() - OOM\n", cosa->name); if (chan->rxdata == NULL) {
mutex_unlock(&chan->rlock); mutex_unlock(&chan->rlock);
return -ENOMEM; return -ENOMEM;
} }
@ -874,9 +874,8 @@ static ssize_t cosa_write(struct file *file,
count = COSA_MTU; count = COSA_MTU;
/* Allocate the buffer */ /* Allocate the buffer */
if ((kbuf = kmalloc(count, GFP_KERNEL|GFP_DMA)) == NULL) { kbuf = kmalloc(count, GFP_KERNEL|GFP_DMA);
pr_notice("%s: cosa_write() OOM - dropping packet\n", if (kbuf == NULL) {
cosa->name);
up(&chan->wsem); up(&chan->wsem);
return -ENOMEM; return -ENOMEM;
} }

6
drivers/net/wan/farsync.c
View File

@ -2448,11 +2448,9 @@ fst_add_one(struct pci_dev *pdev, const struct pci_device_id *ent)
} }
/* Allocate driver private data */ /* Allocate driver private data */
card = kzalloc(sizeof (struct fst_card_info), GFP_KERNEL); card = kzalloc(sizeof(struct fst_card_info), GFP_KERNEL);
if (card == NULL) { if (card == NULL)
pr_err("FarSync card found but insufficient memory for driver storage\n");
return -ENOMEM; return -ENOMEM;
}
/* Try to enable the device */ /* Try to enable the device */
if ((err = pci_enable_device(pdev)) != 0) { if ((err = pci_enable_device(pdev)) != 0) {

9
drivers/net/wan/hdlc.c
View File

@ -280,14 +280,13 @@ int attach_hdlc_protocol(struct net_device *dev, struct hdlc_proto *proto,
if (!try_module_get(proto->module)) if (!try_module_get(proto->module))
return -ENOSYS; return -ENOSYS;
if (size) if (size) {
if ((dev_to_hdlc(dev)->state = kmalloc(size, dev_to_hdlc(dev)->state = kmalloc(size, GFP_KERNEL);
GFP_KERNEL)) == NULL) { if (dev_to_hdlc(dev)->state == NULL) {
netdev_warn(dev,
"Memory squeeze on hdlc_proto_attach()\n");
module_put(proto->module); module_put(proto->module);
return -ENOBUFS; return -ENOBUFS;
} }
}
dev_to_hdlc(dev)->proto = proto; dev_to_hdlc(dev)->proto = proto;
return 0; return 0;
} }

1
drivers/net/wan/x25_asy.c
View File

@ -128,7 +128,6 @@ static int x25_asy_change_mtu(struct net_device *dev, int newmtu)
rbuff = kmalloc(len + 4, GFP_ATOMIC); rbuff = kmalloc(len + 4, GFP_ATOMIC);
if (xbuff == NULL || rbuff == NULL) { if (xbuff == NULL || rbuff == NULL) {
netdev_warn(dev, "unable to grow X.25 buffers, MTU change cancelled\n");
kfree(xbuff); kfree(xbuff);
kfree(rbuff); kfree(rbuff);
return -ENOMEM; return -ENOMEM;