Skip to content

L
linux
Commit ad146e37 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files
Options

Merge tag 'vme-next-4.14-rc4' of https://gitlab.collabora.com/martyn/linux into char-misc-next 

Martyn writes:

VME Subsystem changes for master v4.14-rc4:

 - Corrections across the VME subsystem to better align with the preferred
   kernel coding style.
parents f7f84fde a75dc630
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 157 additions and 228 deletions
drivers/vme/bridges/vme_ca91cx42.c
View file @ ad146e37
...@@ -511,7 +511,7 @@ static int ca91cx42_alloc_resource(struct vme_master_resource *image, ...@@ -511,7 +511,7 @@ static int ca91cx42_alloc_resource(struct vme_master_resource *image,
ca91cx42_bridge = image->parent; ca91cx42_bridge = image->parent;
/* Find pci_dev container of dev */ /* Find pci_dev container of dev */
if (ca91cx42_bridge->parent == NULL) { if (!ca91cx42_bridge->parent) {
dev_err(ca91cx42_bridge->parent, "Dev entry NULL\n"); dev_err(ca91cx42_bridge->parent, "Dev entry NULL\n");
return -EINVAL; return -EINVAL;
} }
...@@ -529,14 +529,12 @@ static int ca91cx42_alloc_resource(struct vme_master_resource *image, ...@@ -529,14 +529,12 @@ static int ca91cx42_alloc_resource(struct vme_master_resource *image,
image->kern_base = NULL; image->kern_base = NULL;
kfree(image->bus_resource.name); kfree(image->bus_resource.name);
release_resource(&image->bus_resource); 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); image->bus_resource.name = kmalloc(VMENAMSIZ+3, GFP_ATOMIC);
if (image->bus_resource.name == NULL) { if (!image->bus_resource.name) {
dev_err(ca91cx42_bridge->parent, "Unable to allocate "
"memory for resource name\n");
retval = -ENOMEM; retval = -ENOMEM;
goto err_name; goto err_name;
} }
...@@ -562,7 +560,7 @@ static int ca91cx42_alloc_resource(struct vme_master_resource *image, ...@@ -562,7 +560,7 @@ static int ca91cx42_alloc_resource(struct vme_master_resource *image,
image->kern_base = ioremap_nocache( image->kern_base = ioremap_nocache(
image->bus_resource.start, size); image->bus_resource.start, size);
if (image->kern_base == NULL) { if (!image->kern_base) {
dev_err(ca91cx42_bridge->parent, "Failed to remap resource\n"); dev_err(ca91cx42_bridge->parent, "Failed to remap resource\n");
retval = -ENOMEM; retval = -ENOMEM;
goto err_remap; goto err_remap;
...@@ -574,7 +572,7 @@ static int ca91cx42_alloc_resource(struct vme_master_resource *image, ...@@ -574,7 +572,7 @@ static int ca91cx42_alloc_resource(struct vme_master_resource *image,
release_resource(&image->bus_resource); release_resource(&image->bus_resource);
err_resource: err_resource:
kfree(image->bus_resource.name); kfree(image->bus_resource.name);
memset(&image->bus_resource, 0, sizeof(struct resource)); memset(&image->bus_resource, 0, sizeof(image->bus_resource));
err_name: err_name:
return retval; return retval;
} }
...@@ -588,7 +586,7 @@ static void ca91cx42_free_resource(struct vme_master_resource *image) ...@@ -588,7 +586,7 @@ static void ca91cx42_free_resource(struct vme_master_resource *image)
image->kern_base = NULL; image->kern_base = NULL;
release_resource(&image->bus_resource); release_resource(&image->bus_resource);
kfree(image->bus_resource.name); 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, ...@@ -1036,10 +1034,8 @@ static int ca91cx42_dma_list_add(struct vme_dma_list *list,
dev = list->parent->parent->parent; dev = list->parent->parent->parent;
/* XXX descriptor must be aligned on 64-bit boundaries */ /* XXX descriptor must be aligned on 64-bit boundaries */
entry = kmalloc(sizeof(struct ca91cx42_dma_entry), GFP_KERNEL); entry = kmalloc(sizeof(*entry), GFP_KERNEL);
if (entry == NULL) { if (!entry) {
dev_err(dev, "Failed to allocate memory for dma resource "
"structure\n");
retval = -ENOMEM; retval = -ENOMEM;
goto err_mem; goto err_mem;
} }
...@@ -1052,7 +1048,7 @@ static int ca91cx42_dma_list_add(struct vme_dma_list *list, ...@@ -1052,7 +1048,7 @@ static int ca91cx42_dma_list_add(struct vme_dma_list *list,
goto err_align; 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) { if (dest->type == VME_DMA_VME) {
entry->descriptor.dctl |= CA91CX42_DCTL_L2V; entry->descriptor.dctl |= CA91CX42_DCTL_L2V;
...@@ -1323,7 +1319,7 @@ static int ca91cx42_lm_set(struct vme_lm_resource *lm, ...@@ -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! */ /* If we already have a callback attached, we can't move it! */
for (i = 0; i < lm->monitors; i++) { for (i = 0; i < lm->monitors; i++) {
if (bridge->lm_callback[i] != NULL) { if (bridge->lm_callback[i]) {
mutex_unlock(&lm->mtx); mutex_unlock(&lm->mtx);
dev_err(dev, "Location monitor callback attached, " dev_err(dev, "Location monitor callback attached, "
"can't reset\n"); "can't reset\n");
...@@ -1432,7 +1428,7 @@ static int ca91cx42_lm_attach(struct vme_lm_resource *lm, int monitor, ...@@ -1432,7 +1428,7 @@ static int ca91cx42_lm_attach(struct vme_lm_resource *lm, int monitor,
} }
/* Check that a callback isn't already attached */ /* Check that a callback isn't already attached */
if (bridge->lm_callback[monitor] != NULL) { if (bridge->lm_callback[monitor]) {
mutex_unlock(&lm->mtx); mutex_unlock(&lm->mtx);
dev_err(dev, "Existing callback attached\n"); dev_err(dev, "Existing callback attached\n");
return -EBUSY; return -EBUSY;
...@@ -1567,7 +1563,7 @@ static int ca91cx42_crcsr_init(struct vme_bridge *ca91cx42_bridge, ...@@ -1567,7 +1563,7 @@ static int ca91cx42_crcsr_init(struct vme_bridge *ca91cx42_bridge,
/* Allocate mem for CR/CSR image */ /* Allocate mem for CR/CSR image */
bridge->crcsr_kernel = pci_zalloc_consistent(pdev, VME_CRCSR_BUF_SIZE, bridge->crcsr_kernel = pci_zalloc_consistent(pdev, VME_CRCSR_BUF_SIZE,
&bridge->crcsr_bus); &bridge->crcsr_bus);
if (bridge->crcsr_kernel == NULL) { if (!bridge->crcsr_kernel) {
dev_err(&pdev->dev, "Failed to allocate memory for CR/CSR " dev_err(&pdev->dev, "Failed to allocate memory for CR/CSR "
"image\n"); "image\n");
return -ENOMEM; return -ENOMEM;
...@@ -1618,21 +1614,15 @@ static int ca91cx42_probe(struct pci_dev *pdev, const struct pci_device_id *id) ...@@ -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 /* We want to support more than one of each bridge so we need to
* dynamically allocate the bridge structure * dynamically allocate the bridge structure
*/ */
ca91cx42_bridge = kzalloc(sizeof(struct vme_bridge), GFP_KERNEL); ca91cx42_bridge = kzalloc(sizeof(*ca91cx42_bridge), GFP_KERNEL);
if (!ca91cx42_bridge) {
if (ca91cx42_bridge == NULL) {
dev_err(&pdev->dev, "Failed to allocate memory for device "
"structure\n");
retval = -ENOMEM; retval = -ENOMEM;
goto err_struct; goto err_struct;
} }
vme_init_bridge(ca91cx42_bridge); vme_init_bridge(ca91cx42_bridge);
ca91cx42_device = kzalloc(sizeof(struct ca91cx42_driver), GFP_KERNEL); ca91cx42_device = kzalloc(sizeof(*ca91cx42_device), GFP_KERNEL);
if (!ca91cx42_device) {
if (ca91cx42_device == NULL) {
dev_err(&pdev->dev, "Failed to allocate memory for device "
"structure\n");
retval = -ENOMEM; retval = -ENOMEM;
goto err_driver; goto err_driver;
} }
...@@ -1688,11 +1678,8 @@ static int ca91cx42_probe(struct pci_dev *pdev, const struct pci_device_id *id) ...@@ -1688,11 +1678,8 @@ static int ca91cx42_probe(struct pci_dev *pdev, const struct pci_device_id *id)
/* Add master windows to list */ /* Add master windows to list */
for (i = 0; i < CA91C142_MAX_MASTER; i++) { for (i = 0; i < CA91C142_MAX_MASTER; i++) {
master_image = kmalloc(sizeof(struct vme_master_resource), master_image = kmalloc(sizeof(*master_image), GFP_KERNEL);
GFP_KERNEL); if (!master_image) {
if (master_image == NULL) {
dev_err(&pdev->dev, "Failed to allocate memory for "
"master resource structure\n");
retval = -ENOMEM; retval = -ENOMEM;
goto err_master; goto err_master;
} }
...@@ -1706,7 +1693,7 @@ static int ca91cx42_probe(struct pci_dev *pdev, const struct pci_device_id *id) ...@@ -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; VME_SUPER | VME_USER | VME_PROG | VME_DATA;
master_image->width_attr = VME_D8 | VME_D16 | VME_D32 | VME_D64; master_image->width_attr = VME_D8 | VME_D16 | VME_D32 | VME_D64;
memset(&master_image->bus_resource, 0, memset(&master_image->bus_resource, 0,
sizeof(struct resource)); sizeof(master_image->bus_resource));
master_image->kern_base = NULL; master_image->kern_base = NULL;
list_add_tail(&master_image->list, list_add_tail(&master_image->list,
&ca91cx42_bridge->master_resources); &ca91cx42_bridge->master_resources);
...@@ -1714,11 +1701,8 @@ static int ca91cx42_probe(struct pci_dev *pdev, const struct pci_device_id *id) ...@@ -1714,11 +1701,8 @@ static int ca91cx42_probe(struct pci_dev *pdev, const struct pci_device_id *id)
/* Add slave windows to list */ /* Add slave windows to list */
for (i = 0; i < CA91C142_MAX_SLAVE; i++) { for (i = 0; i < CA91C142_MAX_SLAVE; i++) {
slave_image = kmalloc(sizeof(struct vme_slave_resource), slave_image = kmalloc(sizeof(*slave_image), GFP_KERNEL);
GFP_KERNEL); if (!slave_image) {
if (slave_image == NULL) {
dev_err(&pdev->dev, "Failed to allocate memory for "
"slave resource structure\n");
retval = -ENOMEM; retval = -ENOMEM;
goto err_slave; goto err_slave;
} }
...@@ -1741,11 +1725,8 @@ static int ca91cx42_probe(struct pci_dev *pdev, const struct pci_device_id *id) ...@@ -1741,11 +1725,8 @@ static int ca91cx42_probe(struct pci_dev *pdev, const struct pci_device_id *id)
/* Add dma engines to list */ /* Add dma engines to list */
for (i = 0; i < CA91C142_MAX_DMA; i++) { for (i = 0; i < CA91C142_MAX_DMA; i++) {
dma_ctrlr = kmalloc(sizeof(struct vme_dma_resource), dma_ctrlr = kmalloc(sizeof(*dma_ctrlr), GFP_KERNEL);
GFP_KERNEL); if (!dma_ctrlr) {
if (dma_ctrlr == NULL) {
dev_err(&pdev->dev, "Failed to allocate memory for "
"dma resource structure\n");
retval = -ENOMEM; retval = -ENOMEM;
goto err_dma; goto err_dma;
} }
...@@ -1762,10 +1743,8 @@ static int ca91cx42_probe(struct pci_dev *pdev, const struct pci_device_id *id) ...@@ -1762,10 +1743,8 @@ static int ca91cx42_probe(struct pci_dev *pdev, const struct pci_device_id *id)
} }
/* Add location monitor to list */ /* Add location monitor to list */
lm = kmalloc(sizeof(struct vme_lm_resource), GFP_KERNEL); lm = kmalloc(sizeof(*lm), GFP_KERNEL);
if (lm == NULL) { if (!lm) {
dev_err(&pdev->dev, "Failed to allocate memory for "
"location monitor resource structure\n");
retval = -ENOMEM; retval = -ENOMEM;
goto err_lm; goto err_lm;
} }
......
drivers/vme/bridges/vme_fake.c
View file @ ad146e37
...@@ -409,7 +409,7 @@ static void fake_lm_check(struct fake_driver *bridge, unsigned long long addr, ...@@ -409,7 +409,7 @@ static void fake_lm_check(struct fake_driver *bridge, unsigned long long addr,
/* Each location monitor covers 8 bytes */ /* Each location monitor covers 8 bytes */
if (((lm_base + (8 * i)) <= addr) && if (((lm_base + (8 * i)) <= addr) &&
((lm_base + (8 * i) + 8) > addr)) { ((lm_base + (8 * i) + 8) > addr)) {
if (bridge->lm_callback[i] != NULL) if (bridge->lm_callback[i])
bridge->lm_callback[i]( bridge->lm_callback[i](
bridge->lm_data[i]); bridge->lm_data[i]);
} }
...@@ -866,7 +866,7 @@ static int fake_lm_set(struct vme_lm_resource *lm, unsigned long long lm_base, ...@@ -866,7 +866,7 @@ static int fake_lm_set(struct vme_lm_resource *lm, unsigned long long lm_base,
/* If we already have a callback attached, we can't move it! */ /* If we already have a callback attached, we can't move it! */
for (i = 0; i < lm->monitors; i++) { for (i = 0; i < lm->monitors; i++) {
if (bridge->lm_callback[i] != NULL) { if (bridge->lm_callback[i]) {
mutex_unlock(&lm->mtx); mutex_unlock(&lm->mtx);
pr_err("Location monitor callback attached, can't reset\n"); pr_err("Location monitor callback attached, can't reset\n");
return -EBUSY; return -EBUSY;
...@@ -940,7 +940,7 @@ static int fake_lm_attach(struct vme_lm_resource *lm, int monitor, ...@@ -940,7 +940,7 @@ static int fake_lm_attach(struct vme_lm_resource *lm, int monitor,
} }
/* Check that a callback isn't already attached */ /* Check that a callback isn't already attached */
if (bridge->lm_callback[monitor] != NULL) { if (bridge->lm_callback[monitor]) {
mutex_unlock(&lm->mtx); mutex_unlock(&lm->mtx);
pr_err("Existing callback attached\n"); pr_err("Existing callback attached\n");
return -EBUSY; return -EBUSY;
...@@ -978,7 +978,7 @@ static int fake_lm_detach(struct vme_lm_resource *lm, int monitor) ...@@ -978,7 +978,7 @@ static int fake_lm_detach(struct vme_lm_resource *lm, int monitor)
/* If all location monitors disabled, disable global Location Monitor */ /* If all location monitors disabled, disable global Location Monitor */
tmp = 0; tmp = 0;
for (i = 0; i < lm->monitors; i++) { for (i = 0; i < lm->monitors; i++) {
if (bridge->lm_callback[i] != NULL) if (bridge->lm_callback[i])
tmp = 1; tmp = 1;
} }
...@@ -1003,7 +1003,7 @@ static void *fake_alloc_consistent(struct device *parent, size_t size, ...@@ -1003,7 +1003,7 @@ static void *fake_alloc_consistent(struct device *parent, size_t size,
{ {
void *alloc = kmalloc(size, GFP_KERNEL); void *alloc = kmalloc(size, GFP_KERNEL);
if (alloc != NULL) if (alloc)
*dma = fake_ptr_to_pci(alloc); *dma = fake_ptr_to_pci(alloc);
return alloc; return alloc;
...@@ -1039,7 +1039,7 @@ static int fake_crcsr_init(struct vme_bridge *fake_bridge) ...@@ -1039,7 +1039,7 @@ static int fake_crcsr_init(struct vme_bridge *fake_bridge)
/* Allocate mem for CR/CSR image */ /* Allocate mem for CR/CSR image */
bridge->crcsr_kernel = kzalloc(VME_CRCSR_BUF_SIZE, GFP_KERNEL); bridge->crcsr_kernel = kzalloc(VME_CRCSR_BUF_SIZE, GFP_KERNEL);
bridge->crcsr_bus = fake_ptr_to_pci(bridge->crcsr_kernel); bridge->crcsr_bus = fake_ptr_to_pci(bridge->crcsr_kernel);
if (bridge->crcsr_kernel == NULL) if (!bridge->crcsr_kernel)
return -ENOMEM; return -ENOMEM;
vstat = fake_slot_get(fake_bridge); vstat = fake_slot_get(fake_bridge);
...@@ -1075,14 +1075,14 @@ static int __init fake_init(void) ...@@ -1075,14 +1075,14 @@ static int __init fake_init(void)
/* If we want to support more than one bridge at some point, we need to /* If we want to support more than one bridge at some point, we need to
* dynamically allocate this so we get one per device. * dynamically allocate this so we get one per device.
*/ */
fake_bridge = kzalloc(sizeof(struct vme_bridge), GFP_KERNEL); fake_bridge = kzalloc(sizeof(*fake_bridge), GFP_KERNEL);
if (fake_bridge == NULL) { if (!fake_bridge) {
retval = -ENOMEM; retval = -ENOMEM;
goto err_struct; goto err_struct;
} }
fake_device = kzalloc(sizeof(struct fake_driver), GFP_KERNEL); fake_device = kzalloc(sizeof(*fake_device), GFP_KERNEL);
if (fake_device == NULL) { if (!fake_device) {
retval = -ENOMEM; retval = -ENOMEM;
goto err_driver; goto err_driver;
} }
...@@ -1104,9 +1104,8 @@ static int __init fake_init(void) ...@@ -1104,9 +1104,8 @@ static int __init fake_init(void)
/* Add master windows to list */ /* Add master windows to list */
INIT_LIST_HEAD(&fake_bridge->master_resources); INIT_LIST_HEAD(&fake_bridge->master_resources);
for (i = 0; i < FAKE_MAX_MASTER; i++) { for (i = 0; i < FAKE_MAX_MASTER; i++) {
master_image = kmalloc(sizeof(struct vme_master_resource), master_image = kmalloc(sizeof(*master_image), GFP_KERNEL);
GFP_KERNEL); if (!master_image) {
if (master_image == NULL) {
retval = -ENOMEM; retval = -ENOMEM;
goto err_master; goto err_master;
} }
...@@ -1131,9 +1130,8 @@ static int __init fake_init(void) ...@@ -1131,9 +1130,8 @@ static int __init fake_init(void)
/* Add slave windows to list */ /* Add slave windows to list */
INIT_LIST_HEAD(&fake_bridge->slave_resources); INIT_LIST_HEAD(&fake_bridge->slave_resources);
for (i = 0; i < FAKE_MAX_SLAVE; i++) { for (i = 0; i < FAKE_MAX_SLAVE; i++) {
slave_image = kmalloc(sizeof(struct vme_slave_resource), slave_image = kmalloc(sizeof(*slave_image), GFP_KERNEL);
GFP_KERNEL); if (!slave_image) {
if (slave_image == NULL) {
retval = -ENOMEM; retval = -ENOMEM;
goto err_slave; goto err_slave;
} }
...@@ -1154,9 +1152,8 @@ static int __init fake_init(void) ...@@ -1154,9 +1152,8 @@ static int __init fake_init(void)
/* Add location monitor to list */ /* Add location monitor to list */
INIT_LIST_HEAD(&fake_bridge->lm_resources); INIT_LIST_HEAD(&fake_bridge->lm_resources);
lm = kmalloc(sizeof(struct vme_lm_resource), GFP_KERNEL); lm = kmalloc(sizeof(*lm), GFP_KERNEL);
if (lm == NULL) { if (!lm) {
pr_err("Failed to allocate memory for location monitor resource structure\n");
retval = -ENOMEM; retval = -ENOMEM;
goto err_lm; goto err_lm;
} }
......
drivers/vme/bridges/vme_tsi148.c
View file @ ad146e37
...@@ -741,18 +741,16 @@ static int tsi148_alloc_resource(struct vme_master_resource *image, ...@@ -741,18 +741,16 @@ static int tsi148_alloc_resource(struct vme_master_resource *image,
image->kern_base = NULL; image->kern_base = NULL;
kfree(image->bus_resource.name); kfree(image->bus_resource.name);
release_resource(&image->bus_resource); release_resource(&image->bus_resource);
memset(&image->bus_resource, 0, sizeof(struct resource)); memset(&image->bus_resource, 0, sizeof(image->bus_resource));
} }
/* Exit here if size is zero */ /* Exit here if size is zero */
if (size == 0) if (size == 0)
return 0; return 0;
if (image->bus_resource.name == NULL) { if (!image->bus_resource.name) {
image->bus_resource.name = kmalloc(VMENAMSIZ+3, GFP_ATOMIC); image->bus_resource.name = kmalloc(VMENAMSIZ+3, GFP_ATOMIC);
if (image->bus_resource.name == NULL) { if (!image->bus_resource.name) {
dev_err(tsi148_bridge->parent, "Unable to allocate "
"memory for resource name\n");
retval = -ENOMEM; retval = -ENOMEM;
goto err_name; goto err_name;
} }
...@@ -778,7 +776,7 @@ static int tsi148_alloc_resource(struct vme_master_resource *image, ...@@ -778,7 +776,7 @@ static int tsi148_alloc_resource(struct vme_master_resource *image,
image->kern_base = ioremap_nocache( image->kern_base = ioremap_nocache(
image->bus_resource.start, size); image->bus_resource.start, size);
if (image->kern_base == NULL) { if (!image->kern_base) {
dev_err(tsi148_bridge->parent, "Failed to remap resource\n"); dev_err(tsi148_bridge->parent, "Failed to remap resource\n");
retval = -ENOMEM; retval = -ENOMEM;
goto err_remap; goto err_remap;
...@@ -790,7 +788,7 @@ static int tsi148_alloc_resource(struct vme_master_resource *image, ...@@ -790,7 +788,7 @@ static int tsi148_alloc_resource(struct vme_master_resource *image,
release_resource(&image->bus_resource); release_resource(&image->bus_resource);
err_resource: err_resource:
kfree(image->bus_resource.name); kfree(image->bus_resource.name);
memset(&image->bus_resource, 0, sizeof(struct resource)); memset(&image->bus_resource, 0, sizeof(image->bus_resource));
err_name: err_name:
return retval; return retval;
} }
...@@ -804,7 +802,7 @@ static void tsi148_free_resource(struct vme_master_resource *image) ...@@ -804,7 +802,7 @@ static void tsi148_free_resource(struct vme_master_resource *image)
image->kern_base = NULL; image->kern_base = NULL;
release_resource(&image->bus_resource); release_resource(&image->bus_resource);
kfree(image->bus_resource.name); kfree(image->bus_resource.name);
memset(&image->bus_resource, 0, sizeof(struct resource)); memset(&image->bus_resource, 0, sizeof(image->bus_resource));
} }
/* /*
...@@ -1641,10 +1639,8 @@ static int tsi148_dma_list_add(struct vme_dma_list *list, ...@@ -1641,10 +1639,8 @@ static int tsi148_dma_list_add(struct vme_dma_list *list,
tsi148_bridge = list->parent->parent; tsi148_bridge = list->parent->parent;
/* Descriptor must be aligned on 64-bit boundaries */ /* Descriptor must be aligned on 64-bit boundaries */
entry = kmalloc(sizeof(struct tsi148_dma_entry), GFP_KERNEL); entry = kmalloc(sizeof(*entry), GFP_KERNEL);
if (entry == NULL) { if (!entry) {
dev_err(tsi148_bridge->parent, "Failed to allocate memory for "
"dma resource structure\n");
retval = -ENOMEM; retval = -ENOMEM;
goto err_mem; goto err_mem;
} }
...@@ -1661,7 +1657,7 @@ static int tsi148_dma_list_add(struct vme_dma_list *list, ...@@ -1661,7 +1657,7 @@ static int tsi148_dma_list_add(struct vme_dma_list *list,
/* Given we are going to fill out the structure, we probably don't /* Given we are going to fill out the structure, we probably don't
* need to zero it, but better safe than sorry for now. * need to zero it, but better safe than sorry for now.
*/ */
memset(&entry->descriptor, 0, sizeof(struct tsi148_dma_descriptor)); memset(&entry->descriptor, 0, sizeof(entry->descriptor));
/* Fill out source part */ /* Fill out source part */
switch (src->type) { switch (src->type) {
...@@ -1756,8 +1752,9 @@ static int tsi148_dma_list_add(struct vme_dma_list *list, ...@@ -1756,8 +1752,9 @@ static int tsi148_dma_list_add(struct vme_dma_list *list,
list_add_tail(&entry->list, &list->entries); list_add_tail(&entry->list, &list->entries);
entry->dma_handle = dma_map_single(tsi148_bridge->parent, entry->dma_handle = dma_map_single(tsi148_bridge->parent,
&entry->descriptor, &entry->descriptor,
sizeof(struct tsi148_dma_descriptor), DMA_TO_DEVICE); sizeof(entry->descriptor),
DMA_TO_DEVICE);
if (dma_mapping_error(tsi148_bridge->parent, entry->dma_handle)) { if (dma_mapping_error(tsi148_bridge->parent, entry->dma_handle)) {
dev_err(tsi148_bridge->parent, "DMA mapping error\n"); dev_err(tsi148_bridge->parent, "DMA mapping error\n");
retval = -EINVAL; retval = -EINVAL;
...@@ -1946,7 +1943,7 @@ static int tsi148_lm_set(struct vme_lm_resource *lm, unsigned long long lm_base, ...@@ -1946,7 +1943,7 @@ static int tsi148_lm_set(struct vme_lm_resource *lm, unsigned long long lm_base,
/* If we already have a callback attached, we can't move it! */ /* If we already have a callback attached, we can't move it! */
for (i = 0; i < lm->monitors; i++) { for (i = 0; i < lm->monitors; i++) {
if (bridge->lm_callback[i] != NULL) { if (bridge->lm_callback[i]) {
mutex_unlock(&lm->mtx); mutex_unlock(&lm->mtx);
dev_err(tsi148_bridge->parent, "Location monitor " dev_err(tsi148_bridge->parent, "Location monitor "
"callback attached, can't reset\n"); "callback attached, can't reset\n");
...@@ -2071,7 +2068,7 @@ static int tsi148_lm_attach(struct vme_lm_resource *lm, int monitor, ...@@ -2071,7 +2068,7 @@ static int tsi148_lm_attach(struct vme_lm_resource *lm, int monitor,
} }
/* Check that a callback isn't already attached */ /* Check that a callback isn't already attached */
if (bridge->lm_callback[monitor] != NULL) { if (bridge->lm_callback[monitor]) {
mutex_unlock(&lm->mtx); mutex_unlock(&lm->mtx);
dev_err(tsi148_bridge->parent, "Existing callback attached\n"); dev_err(tsi148_bridge->parent, "Existing callback attached\n");
return -EBUSY; return -EBUSY;
...@@ -2208,7 +2205,7 @@ static int tsi148_crcsr_init(struct vme_bridge *tsi148_bridge, ...@@ -2208,7 +2205,7 @@ static int tsi148_crcsr_init(struct vme_bridge *tsi148_bridge,
/* Allocate mem for CR/CSR image */ /* Allocate mem for CR/CSR image */
bridge->crcsr_kernel = pci_zalloc_consistent(pdev, VME_CRCSR_BUF_SIZE, bridge->crcsr_kernel = pci_zalloc_consistent(pdev, VME_CRCSR_BUF_SIZE,
&bridge->crcsr_bus); &bridge->crcsr_bus);
if (bridge->crcsr_kernel == NULL) { if (!bridge->crcsr_kernel) {
dev_err(tsi148_bridge->parent, "Failed to allocate memory for " dev_err(tsi148_bridge->parent, "Failed to allocate memory for "
"CR/CSR image\n"); "CR/CSR image\n");
return -ENOMEM; return -ENOMEM;
...@@ -2294,19 +2291,15 @@ static int tsi148_probe(struct pci_dev *pdev, const struct pci_device_id *id) ...@@ -2294,19 +2291,15 @@ static int tsi148_probe(struct pci_dev *pdev, const struct pci_device_id *id)
/* If we want to support more than one of each bridge, we need to /* If we want to support more than one of each bridge, we need to
* dynamically generate this so we get one per device * dynamically generate this so we get one per device
*/ */
tsi148_bridge = kzalloc(sizeof(struct vme_bridge), GFP_KERNEL); tsi148_bridge = kzalloc(sizeof(*tsi148_bridge), GFP_KERNEL);
if (tsi148_bridge == NULL) { if (!tsi148_bridge) {
dev_err(&pdev->dev, "Failed to allocate memory for device "
"structure\n");
retval = -ENOMEM; retval = -ENOMEM;
goto err_struct; goto err_struct;
} }
vme_init_bridge(tsi148_bridge); vme_init_bridge(tsi148_bridge);
tsi148_device = kzalloc(sizeof(struct tsi148_driver), GFP_KERNEL); tsi148_device = kzalloc(sizeof(*tsi148_device), GFP_KERNEL);
if (tsi148_device == NULL) { if (!tsi148_device) {
dev_err(&pdev->dev, "Failed to allocate memory for device "
"structure\n");
retval = -ENOMEM; retval = -ENOMEM;
goto err_driver; goto err_driver;
} }
...@@ -2371,10 +2364,9 @@ static int tsi148_probe(struct pci_dev *pdev, const struct pci_device_id *id) ...@@ -2371,10 +2364,9 @@ static int tsi148_probe(struct pci_dev *pdev, const struct pci_device_id *id)
master_num--; master_num--;
tsi148_device->flush_image = tsi148_device->flush_image =
kmalloc(sizeof(struct vme_master_resource), GFP_KERNEL); kmalloc(sizeof(*tsi148_device->flush_image),
if (tsi148_device->flush_image == NULL) { GFP_KERNEL);
dev_err(&pdev->dev, "Failed to allocate memory for " if (!tsi148_device->flush_image) {
"flush resource structure\n");
retval = -ENOMEM; retval = -ENOMEM;
goto err_master; goto err_master;
} }
...@@ -2383,17 +2375,14 @@ static int tsi148_probe(struct pci_dev *pdev, const struct pci_device_id *id) ...@@ -2383,17 +2375,14 @@ static int tsi148_probe(struct pci_dev *pdev, const struct pci_device_id *id)
tsi148_device->flush_image->locked = 1; tsi148_device->flush_image->locked = 1;
tsi148_device->flush_image->number = master_num; tsi148_device->flush_image->number = master_num;
memset(&tsi148_device->flush_image->bus_resource, 0, memset(&tsi148_device->flush_image->bus_resource, 0,
sizeof(struct resource)); sizeof(tsi148_device->flush_image->bus_resource));
tsi148_device->flush_image->kern_base = NULL; tsi148_device->flush_image->kern_base = NULL;
} }
/* Add master windows to list */ /* Add master windows to list */
for (i = 0; i < master_num; i++) { for (i = 0; i < master_num; i++) {
master_image = kmalloc(sizeof(struct vme_master_resource), master_image = kmalloc(sizeof(*master_image), GFP_KERNEL);
GFP_KERNEL); if (!master_image) {
if (master_image == NULL) {
dev_err(&pdev->dev, "Failed to allocate memory for "
"master resource structure\n");
retval = -ENOMEM; retval = -ENOMEM;
goto err_master; goto err_master;
} }
...@@ -2410,7 +2399,7 @@ static int tsi148_probe(struct pci_dev *pdev, const struct pci_device_id *id) ...@@ -2410,7 +2399,7 @@ static int tsi148_probe(struct pci_dev *pdev, const struct pci_device_id *id)
VME_PROG | VME_DATA; VME_PROG | VME_DATA;
master_image->width_attr = VME_D16 | VME_D32; master_image->width_attr = VME_D16 | VME_D32;
memset(&master_image->bus_resource, 0, memset(&master_image->bus_resource, 0,
sizeof(struct resource)); sizeof(master_image->bus_resource));
master_image->kern_base = NULL; master_image->kern_base = NULL;
list_add_tail(&master_image->list, list_add_tail(&master_image->list,
&tsi148_bridge->master_resources); &tsi148_bridge->master_resources);
...@@ -2418,11 +2407,8 @@ static int tsi148_probe(struct pci_dev *pdev, const struct pci_device_id *id) ...@@ -2418,11 +2407,8 @@ static int tsi148_probe(struct pci_dev *pdev, const struct pci_device_id *id)
/* Add slave windows to list */ /* Add slave windows to list */
for (i = 0; i < TSI148_MAX_SLAVE; i++) { for (i = 0; i < TSI148_MAX_SLAVE; i++) {
slave_image = kmalloc(sizeof(struct vme_slave_resource), slave_image = kmalloc(sizeof(*slave_image), GFP_KERNEL);
GFP_KERNEL); if (!slave_image) {
if (slave_image == NULL) {
dev_err(&pdev->dev, "Failed to allocate memory for "
"slave resource structure\n");
retval = -ENOMEM; retval = -ENOMEM;
goto err_slave; goto err_slave;
} }
...@@ -2442,11 +2428,8 @@ static int tsi148_probe(struct pci_dev *pdev, const struct pci_device_id *id) ...@@ -2442,11 +2428,8 @@ static int tsi148_probe(struct pci_dev *pdev, const struct pci_device_id *id)
/* Add dma engines to list */ /* Add dma engines to list */
for (i = 0; i < TSI148_MAX_DMA; i++) { for (i = 0; i < TSI148_MAX_DMA; i++) {
dma_ctrlr = kmalloc(sizeof(struct vme_dma_resource), dma_ctrlr = kmalloc(sizeof(*dma_ctrlr), GFP_KERNEL);
GFP_KERNEL); if (!dma_ctrlr) {
if (dma_ctrlr == NULL) {
dev_err(&pdev->dev, "Failed to allocate memory for "
"dma resource structure\n");
retval = -ENOMEM; retval = -ENOMEM;
goto err_dma; goto err_dma;
} }
...@@ -2465,10 +2448,8 @@ static int tsi148_probe(struct pci_dev *pdev, const struct pci_device_id *id) ...@@ -2465,10 +2448,8 @@ static int tsi148_probe(struct pci_dev *pdev, const struct pci_device_id *id)
} }
/* Add location monitor to list */ /* Add location monitor to list */
lm = kmalloc(sizeof(struct vme_lm_resource), GFP_KERNEL); lm = kmalloc(sizeof(*lm), GFP_KERNEL);
if (lm == NULL) { if (!lm) {
dev_err(&pdev->dev, "Failed to allocate memory for "
"location monitor resource structure\n");
retval = -ENOMEM; retval = -ENOMEM;
goto err_lm; goto err_lm;
} }
......
drivers/vme/vme.c
View file @ ad146e37
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7