mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-10-02 23:27:06 +00:00
vme: tsi148: Adjust 14 checks for null pointers
MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The script “checkpatch.pl” pointed information out like the following. Comparison to NULL could be written … Thus fix the affected source code places. Signed-off-by: Markus Elfring <elfring@users.sourceforge.net> Signed-off-by: Martyn Welch <martyn@welchs.me.uk>
This commit is contained in:
parent
6d011dd876
commit
a75dc63008
1 changed files with 14 additions and 14 deletions
|
@ -748,9 +748,9 @@ static int tsi148_alloc_resource(struct vme_master_resource *image,
|
||||||
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) {
|
||||||
retval = -ENOMEM;
|
retval = -ENOMEM;
|
||||||
goto err_name;
|
goto err_name;
|
||||||
}
|
}
|
||||||
|
@ -776,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;
|
||||||
|
@ -1640,7 +1640,7 @@ static int tsi148_dma_list_add(struct vme_dma_list *list,
|
||||||
|
|
||||||
/* Descriptor must be aligned on 64-bit boundaries */
|
/* Descriptor must be aligned on 64-bit boundaries */
|
||||||
entry = kmalloc(sizeof(*entry), GFP_KERNEL);
|
entry = kmalloc(sizeof(*entry), GFP_KERNEL);
|
||||||
if (entry == NULL) {
|
if (!entry) {
|
||||||
retval = -ENOMEM;
|
retval = -ENOMEM;
|
||||||
goto err_mem;
|
goto err_mem;
|
||||||
}
|
}
|
||||||
|
@ -1943,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");
|
||||||
|
@ -2068,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;
|
||||||
|
@ -2205,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;
|
||||||
|
@ -2292,14 +2292,14 @@ static int tsi148_probe(struct pci_dev *pdev, const struct pci_device_id *id)
|
||||||
* dynamically generate this so we get one per device
|
* dynamically generate this so we get one per device
|
||||||
*/
|
*/
|
||||||
tsi148_bridge = kzalloc(sizeof(*tsi148_bridge), GFP_KERNEL);
|
tsi148_bridge = kzalloc(sizeof(*tsi148_bridge), GFP_KERNEL);
|
||||||
if (tsi148_bridge == NULL) {
|
if (!tsi148_bridge) {
|
||||||
retval = -ENOMEM;
|
retval = -ENOMEM;
|
||||||
goto err_struct;
|
goto err_struct;
|
||||||
}
|
}
|
||||||
vme_init_bridge(tsi148_bridge);
|
vme_init_bridge(tsi148_bridge);
|
||||||
|
|
||||||
tsi148_device = kzalloc(sizeof(*tsi148_device), GFP_KERNEL);
|
tsi148_device = kzalloc(sizeof(*tsi148_device), GFP_KERNEL);
|
||||||
if (tsi148_device == NULL) {
|
if (!tsi148_device) {
|
||||||
retval = -ENOMEM;
|
retval = -ENOMEM;
|
||||||
goto err_driver;
|
goto err_driver;
|
||||||
}
|
}
|
||||||
|
@ -2366,7 +2366,7 @@ static int tsi148_probe(struct pci_dev *pdev, const struct pci_device_id *id)
|
||||||
tsi148_device->flush_image =
|
tsi148_device->flush_image =
|
||||||
kmalloc(sizeof(*tsi148_device->flush_image),
|
kmalloc(sizeof(*tsi148_device->flush_image),
|
||||||
GFP_KERNEL);
|
GFP_KERNEL);
|
||||||
if (tsi148_device->flush_image == NULL) {
|
if (!tsi148_device->flush_image) {
|
||||||
retval = -ENOMEM;
|
retval = -ENOMEM;
|
||||||
goto err_master;
|
goto err_master;
|
||||||
}
|
}
|
||||||
|
@ -2382,7 +2382,7 @@ static int tsi148_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 < master_num; i++) {
|
for (i = 0; i < master_num; i++) {
|
||||||
master_image = kmalloc(sizeof(*master_image), GFP_KERNEL);
|
master_image = kmalloc(sizeof(*master_image), GFP_KERNEL);
|
||||||
if (master_image == NULL) {
|
if (!master_image) {
|
||||||
retval = -ENOMEM;
|
retval = -ENOMEM;
|
||||||
goto err_master;
|
goto err_master;
|
||||||
}
|
}
|
||||||
|
@ -2408,7 +2408,7 @@ 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(*slave_image), GFP_KERNEL);
|
slave_image = kmalloc(sizeof(*slave_image), GFP_KERNEL);
|
||||||
if (slave_image == NULL) {
|
if (!slave_image) {
|
||||||
retval = -ENOMEM;
|
retval = -ENOMEM;
|
||||||
goto err_slave;
|
goto err_slave;
|
||||||
}
|
}
|
||||||
|
@ -2429,7 +2429,7 @@ 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(*dma_ctrlr), GFP_KERNEL);
|
dma_ctrlr = kmalloc(sizeof(*dma_ctrlr), GFP_KERNEL);
|
||||||
if (dma_ctrlr == NULL) {
|
if (!dma_ctrlr) {
|
||||||
retval = -ENOMEM;
|
retval = -ENOMEM;
|
||||||
goto err_dma;
|
goto err_dma;
|
||||||
}
|
}
|
||||||
|
@ -2449,7 +2449,7 @@ 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(*lm), GFP_KERNEL);
|
lm = kmalloc(sizeof(*lm), GFP_KERNEL);
|
||||||
if (lm == NULL) {
|
if (!lm) {
|
||||||
retval = -ENOMEM;
|
retval = -ENOMEM;
|
||||||
goto err_lm;
|
goto err_lm;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue