vme: Delete 11 error messages for a failed memory allocation

Omit extra messages for a memory allocation failure in these functions.

This issue was detected by using the Coccinelle software.

Signed-off-by: Markus Elfring <elfring@users.sourceforge.net>
Signed-off-by: Martyn Welch <martyn@welchs.me.uk>

diff --git a/drivers/vme/vme.c b/drivers/vme/vme.c
index 6a3ead42aba876cef534b8e9acc34b30cf6cef3a..53e87af8e0b8b1310f1a0e79cc074563ca797dd9 100644 (file)
--- a/drivers/vme/vme.c
+++ b/drivers/vme/vme.c
@@ -337,10 +337,9 @@ struct vme_resource *vme_slave_request(struct vme_dev *vdev, u32 address,
                goto err_image;
 
        resource = kmalloc(sizeof(struct vme_resource), GFP_KERNEL);
-       if (resource == NULL) {
-               printk(KERN_WARNING "Unable to allocate resource structure\n");
+       if (!resource)
                goto err_alloc;
-       }
+
        resource->type = VME_SLAVE;
        resource->entry = &allocated_image->list;
 
@@ -542,10 +541,9 @@ struct vme_resource *vme_master_request(struct vme_dev *vdev, u32 address,
        }
 
        resource = kmalloc(sizeof(struct vme_resource), GFP_KERNEL);
-       if (resource == NULL) {
-               printk(KERN_ERR "Unable to allocate resource structure\n");
+       if (!resource)
                goto err_alloc;
-       }
+
        resource->type = VME_MASTER;
        resource->entry = &allocated_image->list;
 
@@ -919,10 +917,9 @@ struct vme_resource *vme_dma_request(struct vme_dev *vdev, u32 route)
                goto err_ctrlr;
 
        resource = kmalloc(sizeof(struct vme_resource), GFP_KERNEL);
-       if (resource == NULL) {
-               printk(KERN_WARNING "Unable to allocate resource structure\n");
+       if (!resource)
                goto err_alloc;
-       }
+
        resource->type = VME_DMA;
        resource->entry = &allocated_ctrlr->list;
 
@@ -962,10 +959,9 @@ struct vme_dma_list *vme_new_dma_list(struct vme_resource *resource)
        ctrlr = list_entry(resource->entry, struct vme_dma_resource, list);
 
        dma_list = kmalloc(sizeof(struct vme_dma_list), GFP_KERNEL);
-       if (dma_list == NULL) {
-               printk(KERN_ERR "Unable to allocate memory for new DMA list\n");
+       if (!dma_list)
                return NULL;
-       }
+
        INIT_LIST_HEAD(&dma_list->entries);
        dma_list->parent = ctrlr;
        mutex_init(&dma_list->mtx);
@@ -991,16 +987,12 @@ struct vme_dma_attr *vme_dma_pattern_attribute(u32 pattern, u32 type)
        struct vme_dma_pattern *pattern_attr;
 
        attributes = kmalloc(sizeof(struct vme_dma_attr), GFP_KERNEL);
-       if (attributes == NULL) {
-               printk(KERN_ERR "Unable to allocate memory for attributes structure\n");
+       if (!attributes)
                goto err_attr;
-       }
 
        pattern_attr = kmalloc(sizeof(struct vme_dma_pattern), GFP_KERNEL);
-       if (pattern_attr == NULL) {
-               printk(KERN_ERR "Unable to allocate memory for pattern attributes\n");
+       if (!pattern_attr)
                goto err_pat;
-       }
 
        attributes->type = VME_DMA_PATTERN;
        attributes->private = (void *)pattern_attr;
@@ -1035,18 +1027,12 @@ struct vme_dma_attr *vme_dma_pci_attribute(dma_addr_t address)
        /* XXX Run some sanity checks here */
 
        attributes = kmalloc(sizeof(struct vme_dma_attr), GFP_KERNEL);
-       if (attributes == NULL) {
-               printk(KERN_ERR "Unable to allocate memory for attributes structure\n");
+       if (!attributes)
                goto err_attr;
-       }
 
        pci_attr = kmalloc(sizeof(struct vme_dma_pci), GFP_KERNEL);
-       if (pci_attr == NULL) {
-               printk(KERN_ERR "Unable to allocate memory for PCI attributes\n");
+       if (!pci_attr)
                goto err_pci;
-       }
-
-
 
        attributes->type = VME_DMA_PCI;
        attributes->private = (void *)pci_attr;
@@ -1083,16 +1069,12 @@ struct vme_dma_attr *vme_dma_vme_attribute(unsigned long long address,
 
        attributes = kmalloc(
                sizeof(struct vme_dma_attr), GFP_KERNEL);
-       if (attributes == NULL) {
-               printk(KERN_ERR "Unable to allocate memory for attributes structure\n");
+       if (!attributes)
                goto err_attr;
-       }
 
        vme_attr = kmalloc(sizeof(struct vme_dma_vme), GFP_KERNEL);
-       if (vme_attr == NULL) {
-               printk(KERN_ERR "Unable to allocate memory for VME attributes\n");
+       if (!vme_attr)
                goto err_vme;
-       }
 
        attributes->type = VME_DMA_VME;
        attributes->private = (void *)vme_attr;
@@ -1539,10 +1521,9 @@ struct vme_resource *vme_lm_request(struct vme_dev *vdev)
                goto err_lm;
 
        resource = kmalloc(sizeof(struct vme_resource), GFP_KERNEL);
-       if (resource == NULL) {
-               printk(KERN_ERR "Unable to allocate resource structure\n");
+       if (!resource)
                goto err_alloc;
-       }
+
        resource->type = VME_LM;
        resource->entry = &allocated_lm->list;