diff options
author | Joe Perches <joe@perches.com> | 2013-02-11 09:41:29 -0800 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-02-11 10:10:33 -0800 |
commit | 78110bb8dc4a7ff331bfa3cfe7d4e287cfb3f22b (patch) | |
tree | 6534f66eb765163602ad1af98c651bea6ae09416 /drivers/staging/vme | |
parent | ad463ac42771a0bb8a706cf8a985788fe5f5c1c6 (diff) | |
download | linux-78110bb8dc4a7ff331bfa3cfe7d4e287cfb3f22b.tar.gz linux-78110bb8dc4a7ff331bfa3cfe7d4e287cfb3f22b.tar.bz2 linux-78110bb8dc4a7ff331bfa3cfe7d4e287cfb3f22b.zip |
staging: Remove unnecessary OOM messages
alloc failures already get standardized OOM
messages and a dump_stack.
For the affected mallocs around these OOM messages:
Converted kzallocs with multiplies to kcalloc.
Converted kmallocs with multiplies to kmalloc_array.
Converted a kmalloc/strlen/strncpy to kstrdup.
Moved a spin_lock below a removed OOM message and
removed a now unnecessary spin_unlock.
Neatened alignment and whitespace.
Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/vme')
-rw-r--r-- | drivers/staging/vme/devices/vme_pio2_core.c | 1 | ||||
-rw-r--r-- | drivers/staging/vme/devices/vme_pio2_gpio.c | 4 | ||||
-rw-r--r-- | drivers/staging/vme/devices/vme_user.c | 2 |
3 files changed, 1 insertions, 6 deletions
diff --git a/drivers/staging/vme/devices/vme_pio2_core.c b/drivers/staging/vme/devices/vme_pio2_core.c index bf73ba26e88a..fd19c257f533 100644 --- a/drivers/staging/vme/devices/vme_pio2_core.c +++ b/drivers/staging/vme/devices/vme_pio2_core.c @@ -222,7 +222,6 @@ static int pio2_probe(struct vme_dev *vdev) card = kzalloc(sizeof(struct pio2_card), GFP_KERNEL); if (card == NULL) { - dev_err(&vdev->dev, "Unable to allocate card structure\n"); retval = -ENOMEM; goto err_struct; } diff --git a/drivers/staging/vme/devices/vme_pio2_gpio.c b/drivers/staging/vme/devices/vme_pio2_gpio.c index 69d880517e07..2a2d920d980b 100644 --- a/drivers/staging/vme/devices/vme_pio2_gpio.c +++ b/drivers/staging/vme/devices/vme_pio2_gpio.c @@ -192,10 +192,8 @@ int pio2_gpio_init(struct pio2_card *card) char *label; label = kmalloc(PIO2_NUM_CHANNELS, GFP_KERNEL); - if (label == NULL) { - dev_err(&card->vdev->dev, "Unable to allocate GPIO label\n"); + if (label == NULL) return -ENOMEM; - } sprintf(label, "%s@%s", driver_name, dev_name(&card->vdev->dev)); card->gc.label = label; diff --git a/drivers/staging/vme/devices/vme_user.c b/drivers/staging/vme/devices/vme_user.c index 4ef852c4c4e1..57474cff51f0 100644 --- a/drivers/staging/vme/devices/vme_user.c +++ b/drivers/staging/vme/devices/vme_user.c @@ -761,8 +761,6 @@ static int vme_user_probe(struct vme_dev *vdev) image[i].size_buf = PCI_BUF_SIZE; image[i].kern_buf = kmalloc(image[i].size_buf, GFP_KERNEL); if (image[i].kern_buf == NULL) { - dev_warn(&vdev->dev, - "Unable to allocate memory for master window buffers\n"); err = -ENOMEM; goto err_master_buf; } |