Merge tag 'char-misc-4.15-rc1' of ssh://gitolite.kernel.org/pub/scm/linux/kernel...

[linux-2.6-microblaze.git] / drivers / vme / bridges / vme_ca91cx42.c

diff --git a/drivers/vme/bridges/vme_ca91cx42.c b/drivers/vme/bridges/vme_ca91cx42.c
index 7cc5122..5dd2840 100644 (file)
--- a/drivers/vme/bridges/vme_ca91cx42.c
+++ b/drivers/vme/bridges/vme_ca91cx42.c
@@ -511,7 +511,7 @@ static int ca91cx42_alloc_resource(struct vme_master_resource *image,
        ca91cx42_bridge = image->parent;
 
        /* Find pci_dev container of dev */
-       if (ca91cx42_bridge->parent == NULL) {
+       if (!ca91cx42_bridge->parent) {
                dev_err(ca91cx42_bridge->parent, "Dev entry NULL\n");
                return -EINVAL;
        }
@@ -529,14 +529,12 @@ static int ca91cx42_alloc_resource(struct vme_master_resource *image,
                image->kern_base = NULL;
                kfree(image->bus_resource.name);
                release_resource(&image->bus_resource);
-               memset(&image->bus_resource, 0, sizeof(struct resource));
+               memset(&image->bus_resource, 0, sizeof(image->bus_resource));
        }
 
-       if (image->bus_resource.name == NULL) {
+       if (!image->bus_resource.name) {
                image->bus_resource.name = kmalloc(VMENAMSIZ+3, GFP_ATOMIC);
-               if (image->bus_resource.name == NULL) {
-                       dev_err(ca91cx42_bridge->parent, "Unable to allocate "
-                               "memory for resource name\n");
+               if (!image->bus_resource.name) {
                        retval = -ENOMEM;
                        goto err_name;
                }
@@ -562,7 +560,7 @@ static int ca91cx42_alloc_resource(struct vme_master_resource *image,
 
        image->kern_base = ioremap_nocache(
                image->bus_resource.start, size);
-       if (image->kern_base == NULL) {
+       if (!image->kern_base) {
                dev_err(ca91cx42_bridge->parent, "Failed to remap resource\n");
                retval = -ENOMEM;
                goto err_remap;
@@ -574,7 +572,7 @@ err_remap:
        release_resource(&image->bus_resource);
 err_resource:
        kfree(image->bus_resource.name);
-       memset(&image->bus_resource, 0, sizeof(struct resource));
+       memset(&image->bus_resource, 0, sizeof(image->bus_resource));
 err_name:
        return retval;
 }
@@ -588,7 +586,7 @@ static void ca91cx42_free_resource(struct vme_master_resource *image)
        image->kern_base = NULL;
        release_resource(&image->bus_resource);
        kfree(image->bus_resource.name);
-       memset(&image->bus_resource, 0, sizeof(struct resource));
+       memset(&image->bus_resource, 0, sizeof(image->bus_resource));
 }
 
 
@@ -1036,10 +1034,8 @@ static int ca91cx42_dma_list_add(struct vme_dma_list *list,
        dev = list->parent->parent->parent;
 
        /* XXX descriptor must be aligned on 64-bit boundaries */
-       entry = kmalloc(sizeof(struct ca91cx42_dma_entry), GFP_KERNEL);
-       if (entry == NULL) {
-               dev_err(dev, "Failed to allocate memory for dma resource "
-                       "structure\n");
+       entry = kmalloc(sizeof(*entry), GFP_KERNEL);
+       if (!entry) {
                retval = -ENOMEM;
                goto err_mem;
        }
@@ -1052,7 +1048,7 @@ static int ca91cx42_dma_list_add(struct vme_dma_list *list,
                goto err_align;
        }
 
-       memset(&entry->descriptor, 0, sizeof(struct ca91cx42_dma_descriptor));
+       memset(&entry->descriptor, 0, sizeof(entry->descriptor));
 
        if (dest->type == VME_DMA_VME) {
                entry->descriptor.dctl |= CA91CX42_DCTL_L2V;
@@ -1323,7 +1319,7 @@ static int ca91cx42_lm_set(struct vme_lm_resource *lm,
 
        /* If we already have a callback attached, we can't move it! */
        for (i = 0; i < lm->monitors; i++) {
-               if (bridge->lm_callback[i] != NULL) {
+               if (bridge->lm_callback[i]) {
                        mutex_unlock(&lm->mtx);
                        dev_err(dev, "Location monitor callback attached, "
                                "can't reset\n");
@@ -1432,7 +1428,7 @@ static int ca91cx42_lm_attach(struct vme_lm_resource *lm, int monitor,
        }
 
        /* Check that a callback isn't already attached */
-       if (bridge->lm_callback[monitor] != NULL) {
+       if (bridge->lm_callback[monitor]) {
                mutex_unlock(&lm->mtx);
                dev_err(dev, "Existing callback attached\n");
                return -EBUSY;
@@ -1567,7 +1563,7 @@ static int ca91cx42_crcsr_init(struct vme_bridge *ca91cx42_bridge,
        /* Allocate mem for CR/CSR image */
        bridge->crcsr_kernel = pci_zalloc_consistent(pdev, VME_CRCSR_BUF_SIZE,
                                                     &bridge->crcsr_bus);
-       if (bridge->crcsr_kernel == NULL) {
+       if (!bridge->crcsr_kernel) {
                dev_err(&pdev->dev, "Failed to allocate memory for CR/CSR "
                        "image\n");
                return -ENOMEM;
@@ -1618,21 +1614,15 @@ static int ca91cx42_probe(struct pci_dev *pdev, const struct pci_device_id *id)
        /* We want to support more than one of each bridge so we need to
         * dynamically allocate the bridge structure
         */
-       ca91cx42_bridge = kzalloc(sizeof(struct vme_bridge), GFP_KERNEL);
-
-       if (ca91cx42_bridge == NULL) {
-               dev_err(&pdev->dev, "Failed to allocate memory for device "
-                       "structure\n");
+       ca91cx42_bridge = kzalloc(sizeof(*ca91cx42_bridge), GFP_KERNEL);
+       if (!ca91cx42_bridge) {
                retval = -ENOMEM;
                goto err_struct;
        }
        vme_init_bridge(ca91cx42_bridge);
 
-       ca91cx42_device = kzalloc(sizeof(struct ca91cx42_driver), GFP_KERNEL);
-
-       if (ca91cx42_device == NULL) {
-               dev_err(&pdev->dev, "Failed to allocate memory for device "
-                       "structure\n");
+       ca91cx42_device = kzalloc(sizeof(*ca91cx42_device), GFP_KERNEL);
+       if (!ca91cx42_device) {
                retval = -ENOMEM;
                goto err_driver;
        }
@@ -1688,11 +1678,8 @@ static int ca91cx42_probe(struct pci_dev *pdev, const struct pci_device_id *id)
 
        /* Add master windows to list */
        for (i = 0; i < CA91C142_MAX_MASTER; i++) {
-               master_image = kmalloc(sizeof(struct vme_master_resource),
-                       GFP_KERNEL);
-               if (master_image == NULL) {
-                       dev_err(&pdev->dev, "Failed to allocate memory for "
-                       "master resource structure\n");
+               master_image = kmalloc(sizeof(*master_image), GFP_KERNEL);
+               if (!master_image) {
                        retval = -ENOMEM;
                        goto err_master;
                }
@@ -1706,7 +1693,7 @@ static int ca91cx42_probe(struct pci_dev *pdev, const struct pci_device_id *id)
                        VME_SUPER | VME_USER | VME_PROG | VME_DATA;
                master_image->width_attr = VME_D8 | VME_D16 | VME_D32 | VME_D64;
                memset(&master_image->bus_resource, 0,
-                       sizeof(struct resource));
+                      sizeof(master_image->bus_resource));
                master_image->kern_base  = NULL;
                list_add_tail(&master_image->list,
                        &ca91cx42_bridge->master_resources);
@@ -1714,11 +1701,8 @@ static int ca91cx42_probe(struct pci_dev *pdev, const struct pci_device_id *id)
 
        /* Add slave windows to list */
        for (i = 0; i < CA91C142_MAX_SLAVE; i++) {
-               slave_image = kmalloc(sizeof(struct vme_slave_resource),
-                       GFP_KERNEL);
-               if (slave_image == NULL) {
-                       dev_err(&pdev->dev, "Failed to allocate memory for "
-                       "slave resource structure\n");
+               slave_image = kmalloc(sizeof(*slave_image), GFP_KERNEL);
+               if (!slave_image) {
                        retval = -ENOMEM;
                        goto err_slave;
                }
@@ -1741,11 +1725,8 @@ static int ca91cx42_probe(struct pci_dev *pdev, const struct pci_device_id *id)
 
        /* Add dma engines to list */
        for (i = 0; i < CA91C142_MAX_DMA; i++) {
-               dma_ctrlr = kmalloc(sizeof(struct vme_dma_resource),
-                       GFP_KERNEL);
-               if (dma_ctrlr == NULL) {
-                       dev_err(&pdev->dev, "Failed to allocate memory for "
-                       "dma resource structure\n");
+               dma_ctrlr = kmalloc(sizeof(*dma_ctrlr), GFP_KERNEL);
+               if (!dma_ctrlr) {
                        retval = -ENOMEM;
                        goto err_dma;
                }
@@ -1762,10 +1743,8 @@ static int ca91cx42_probe(struct pci_dev *pdev, const struct pci_device_id *id)
        }
 
        /* Add location monitor to list */
-       lm = kmalloc(sizeof(struct vme_lm_resource), GFP_KERNEL);
-       if (lm == NULL) {
-               dev_err(&pdev->dev, "Failed to allocate memory for "
-               "location monitor resource structure\n");
+       lm = kmalloc(sizeof(*lm), GFP_KERNEL);
+       if (!lm) {
                retval = -ENOMEM;
                goto err_lm;
        }