korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-11-25 13:14:07 +08:00
Code Issues Packages Projects Releases Wiki Activity

rapidio: adjust 12 checks for null pointers

Browse Source 
checkpatch pointed information out like the following.

  Comparison to NULL could be written ...

Thus fix the affected source code places.

Link: http://lkml.kernel.org/r/739f9f1c-3ebe-c21b-c5e2-31976cfbc0ee@users.sourceforge.net
Signed-off-by: Markus Elfring <elfring@users.sourceforge.net>
Acked-by: Alexandre Bounine <alexandre.bounine@idt.com>
Cc: Matt Porter <mporter@kernel.crashing.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Markus Elfring 2018-02-06 15:39:44 -08:00 committed by Linus Torvalds
parent 0c5afcade3
commit 93dd49afc2
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
drivers/rapidio/rio.c
View File

@ -243,7 +243,7 @@ int rio_request_inb_mbox(struct rio_mport *mport,
int rc = -ENOSYS; int rc = -ENOSYS;
struct resource *res; struct resource *res;
if (mport->ops->open_inb_mbox == NULL) if (!mport->ops->open_inb_mbox)
goto out; goto out;
res = kzalloc(sizeof(struct resource), GFP_KERNEL); res = kzalloc(sizeof(struct resource), GFP_KERNEL);
@ -326,7 +326,7 @@ int rio_request_outb_mbox(struct rio_mport *mport,
int rc = -ENOSYS; int rc = -ENOSYS;
struct resource *res; struct resource *res;
if (mport->ops->open_outb_mbox == NULL) if (!mport->ops->open_outb_mbox)
goto out; goto out;
res = kzalloc(sizeof(struct resource), GFP_KERNEL); res = kzalloc(sizeof(struct resource), GFP_KERNEL);
@ -632,7 +632,7 @@ int rio_request_inb_pwrite(struct rio_dev *rdev,
int rc = 0; int rc = 0;
spin_lock(&rio_global_list_lock); spin_lock(&rio_global_list_lock);
if (rdev->pwcback != NULL) if (rdev->pwcback)
rc = -ENOMEM; rc = -ENOMEM;
else else
rdev->pwcback = pwcback; rdev->pwcback = pwcback;
@ -975,7 +975,7 @@ rio_chk_dev_route(struct rio_dev *rdev, struct rio_dev **nrdev, int *npnum)
rdev = rdev->prev; rdev = rdev->prev;
} }
if (prev == NULL) if (!prev)
goto err_out; goto err_out;
p_port = prev->rswitch->route_table[rdev->destid]; p_port = prev->rswitch->route_table[rdev->destid];
@ -1054,7 +1054,7 @@ rio_get_input_status(struct rio_dev *rdev, int pnum, u32 *lnkresp)
RIO_MNT_REQ_CMD_IS); RIO_MNT_REQ_CMD_IS);
/* Exit if the response is not expected */ /* Exit if the response is not expected */
if (lnkresp == NULL) if (!lnkresp)
return 0; return 0;
checkcount = 3; checkcount = 3;
@ -1696,7 +1696,7 @@ int rio_route_add_entry(struct rio_dev *rdev,
spin_lock(&rdev->rswitch->lock); spin_lock(&rdev->rswitch->lock);
if (ops == NULL || ops->add_entry == NULL) { if (!ops || !ops->add_entry) {
rc = rio_std_route_add_entry(rdev->net->hport, rdev->destid, rc = rio_std_route_add_entry(rdev->net->hport, rdev->destid,
rdev->hopcount, table, rdev->hopcount, table,
route_destid, route_port); route_destid, route_port);
@ -1749,7 +1749,7 @@ int rio_route_get_entry(struct rio_dev *rdev, u16 table,
spin_lock(&rdev->rswitch->lock); spin_lock(&rdev->rswitch->lock);
if (ops == NULL || ops->get_entry == NULL) { if (!ops || !ops->get_entry) {
rc = rio_std_route_get_entry(rdev->net->hport, rdev->destid, rc = rio_std_route_get_entry(rdev->net->hport, rdev->destid,
rdev->hopcount, table, rdev->hopcount, table,
route_destid, route_port); route_destid, route_port);
@ -1797,7 +1797,7 @@ int rio_route_clr_table(struct rio_dev *rdev, u16 table, int lock)
spin_lock(&rdev->rswitch->lock); spin_lock(&rdev->rswitch->lock);
if (ops == NULL || ops->clr_table == NULL) { if (!ops || !ops->clr_table) {
rc = rio_std_route_clr_table(rdev->net->hport, rdev->destid, rc = rio_std_route_clr_table(rdev->net->hport, rdev->destid,
rdev->hopcount, table); rdev->hopcount, table);
} else if (try_module_get(ops->owner)) { } else if (try_module_get(ops->owner)) {
@ -1889,7 +1889,7 @@ struct dma_async_tx_descriptor *rio_dma_prep_xfer(struct dma_chan *dchan,
{ {
struct rio_dma_ext rio_ext; struct rio_dma_ext rio_ext;
if (dchan->device->device_prep_slave_sg == NULL) { if (!dchan->device->device_prep_slave_sg) {
pr_err("%s: prep_rio_sg == NULL\n", __func__); pr_err("%s: prep_rio_sg == NULL\n", __func__);
return NULL; return NULL;
} }