From: SF Markus Elfring <elfring@users.sourceforge.net>
To: kernel-janitors@vger.kernel.org, Lee Jones <lee.jones@linaro.org>
Cc: LKML <linux-kernel@vger.kernel.org>
Subject: [PATCH v2 06/17 2/2] mfd: sm501: Adjust 12 checks for null pointers
Date: Fri, 9 Mar 2018 17:13:45 +0100 [thread overview]
Message-ID: <239db775-b9e6-57f9-23af-9a1a551255e8@users.sourceforge.net> (raw)
In-Reply-To: <5271ab9f-3be1-035c-90c1-8faba2e119b8@users.sourceforge.net>
From: Markus Elfring <elfring@users.sourceforge.net>
Date: Thu, 8 Mar 2018 14:20:06 +0100
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>
---
v2:
Lee Jones requested a resend for this patch. The change was rebased
on source files from Linux next-20180308.
drivers/mfd/sm501.c | 26 +++++++++++---------------
1 file changed, 11 insertions(+), 15 deletions(-)
diff --git a/drivers/mfd/sm501.c b/drivers/mfd/sm501.c
index 4f4957ea8fa3..55d19fd0994e 100644
--- a/drivers/mfd/sm501.c
+++ b/drivers/mfd/sm501.c
@@ -1050,13 +1050,13 @@ static int sm501_register_gpio(struct sm501_devdata *sm)
spin_lock_init(&gpio->lock);
gpio->regs_res = request_mem_region(iobase, 0x20, "sm501-gpio");
- if (gpio->regs_res == NULL) {
+ if (!gpio->regs_res) {
dev_err(sm->dev, "gpio: failed to request region\n");
return -ENXIO;
}
gpio->regs = ioremap(iobase, 0x20);
- if (gpio->regs == NULL) {
+ if (!gpio->regs) {
dev_err(sm->dev, "gpio: failed to remap registers\n");
ret = -ENXIO;
goto err_claimed;
@@ -1358,7 +1358,7 @@ static int sm501_init_dev(struct sm501_devdata *sm)
sm501_register_gpio(sm);
}
- if (pdata && pdata->gpio_i2c != NULL && pdata->gpio_i2c_nr > 0) {
+ if (pdata && pdata->gpio_i2c && pdata->gpio_i2c_nr > 0) {
if (!sm501_gpio_isregistered(sm))
dev_err(sm->dev, "no gpio available for i2c gpio.\n");
else
@@ -1384,7 +1384,7 @@ static int sm501_plat_probe(struct platform_device *dev)
int ret;
sm = kzalloc(sizeof(*sm), GFP_KERNEL);
- if (sm == NULL) {
+ if (!sm) {
ret = -ENOMEM;
goto err1;
}
@@ -1402,8 +1402,7 @@ static int sm501_plat_probe(struct platform_device *dev)
sm->io_res = platform_get_resource(dev, IORESOURCE_MEM, 1);
sm->mem_res = platform_get_resource(dev, IORESOURCE_MEM, 0);
-
- if (sm->io_res == NULL || sm->mem_res == NULL) {
+ if (!sm->io_res || !sm->mem_res) {
dev_err(&dev->dev, "failed to get IO resource\n");
ret = -ENOENT;
goto err_res;
@@ -1411,8 +1410,7 @@ static int sm501_plat_probe(struct platform_device *dev)
sm->regs_claim = request_mem_region(sm->io_res->start,
0x100, "sm501");
-
- if (sm->regs_claim == NULL) {
+ if (!sm->regs_claim) {
dev_err(&dev->dev, "cannot claim registers\n");
ret = -EBUSY;
goto err_res;
@@ -1421,8 +1419,7 @@ static int sm501_plat_probe(struct platform_device *dev)
platform_set_drvdata(dev, sm);
sm->regs = ioremap(sm->io_res->start, resource_size(sm->io_res));
-
- if (sm->regs == NULL) {
+ if (!sm->regs) {
dev_err(&dev->dev, "cannot remap registers\n");
ret = -EIO;
goto err_claim;
@@ -1448,7 +1445,7 @@ static void sm501_set_power(struct sm501_devdata *sm, int on)
{
struct sm501_platdata *pd = sm->platdata;
- if (pd == NULL)
+ if (!pd)
return;
if (pd->get_power) {
@@ -1573,7 +1570,7 @@ static int sm501_pci_probe(struct pci_dev *dev,
int err;
sm = kzalloc(sizeof(*sm), GFP_KERNEL);
- if (sm == NULL) {
+ if (!sm) {
err = -ENOMEM;
goto err1;
}
@@ -1624,15 +1621,14 @@ static int sm501_pci_probe(struct pci_dev *dev,
sm->regs_claim = request_mem_region(sm->io_res->start,
0x100, "sm501");
- if (sm->regs_claim == NULL) {
+ if (!sm->regs_claim) {
dev_err(&dev->dev, "cannot claim registers\n");
err= -EBUSY;
goto err3;
}
sm->regs = pci_ioremap_bar(dev, 1);
-
- if (sm->regs == NULL) {
+ if (!sm->regs) {
dev_err(&dev->dev, "cannot remap registers\n");
err = -EIO;
goto err4;
--
2.16.2
next prev parent reply other threads:[~2018-03-09 16:13 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-03-09 15:55 [PATCH v2 00/17] MFD: Adjustments for several function implementations SF Markus Elfring
2018-03-09 16:00 ` [PATCH v2 0/3] mfd/abx500-core: Adjustments for eight " SF Markus Elfring
2018-03-09 16:01 ` [PATCH v2 01/17 1/3] mfd: abx500-core: Delete an error message for a failed memory allocation in abx500_register_ops() SF Markus Elfring
2018-03-09 16:02 ` [PATCH v2 02/17 2/3] mfd: abx500-core: Improve two size determinations " SF Markus Elfring
2018-03-09 16:03 ` [PATCH v2 03/17 3/3] mfd: abx500-core: Adjust 14 checks for null pointers SF Markus Elfring
2018-03-24 14:25 ` [PATCH v2 0/3] mfd/abx500-core: Adjustments for eight function implementations Linus Walleij
2018-03-09 16:07 ` [PATCH v2 04/17] mfd: si476x-i2c: Delete an error message for a failed memory allocation in si476x_core_probe() SF Markus Elfring
2018-03-09 16:10 ` [PATCH v2 0/2] mfd/sm501: Adjustments for five function implementations SF Markus Elfring
2018-03-09 16:12 ` [PATCH v2 05/17 1/2] mfd: sm501: Improve a size determination in two functions SF Markus Elfring
2018-03-09 16:13 ` SF Markus Elfring [this message]
2018-03-09 16:17 ` [PATCH v2 07/17] mfd: smsc-ece1099: Improve a size determination in smsc_i2c_probe() SF Markus Elfring
2018-03-09 16:18 ` [PATCH v2 08/17] mfd: ti_am335x_tscadc: Delete an error message for a failed memory allocation in ti_tscadc_probe() SF Markus Elfring
2018-03-09 16:20 ` [PATCH v2 09/17] mfd: tps65090: Delete an error message for a failed memory allocation in tps65090_i2c_probe() SF Markus Elfring
2018-03-09 16:22 ` [PATCH v2 10/17] mfd: tps6586x: Delete an error message for a failed memory allocation in tps6586x_parse_dt() SF Markus Elfring
2018-03-09 16:24 ` [PATCH v2 0/4] mfd/tps65910: Adjustments for four function implementations SF Markus Elfring
2018-03-09 16:28 ` [PATCH v2 11/17] mfd: tps65910: Delete an error message for a failed memory allocation in tps65910_parse_dt() SF Markus Elfring
2018-03-09 16:37 ` [PATCH v2 12/17 2/4] mfd: tps65910: Delete an unnecessary variable initialisation in four functions SF Markus Elfring
2018-03-09 16:39 ` [PATCH v2 13/17 3/4] mfd: tps65910: Delete an unnecessary variable initialisation in tps65910_sleepinit() SF Markus Elfring
2018-03-09 16:42 ` [PATCH v2 14/17 4/4] mfd: tps65910: Move an assignment " SF Markus Elfring
2018-03-12 8:57 ` Lee Jones
2018-03-13 7:14 ` [v2 14/17 4/4] mfd: tps65910: Checking patch structures SF Markus Elfring
2018-03-13 7:56 ` Lee Jones
2018-03-09 16:46 ` [PATCH v2 15/17] mfd: tps80031: Delete an error message for a failed memory allocation in tps80031_probe() SF Markus Elfring
2018-03-09 16:49 ` [PATCH v2 16/17] mfd: twl6030-irq: Delete an error message for a failed memory allocation in twl6030_init_irq() SF Markus Elfring
2018-03-09 16:50 ` [PATCH v2 17/17] mfd: viperboard: Delete an error message for a failed memory allocation in vprbrd_probe() SF Markus Elfring
2018-03-27 8:03 ` [PATCH v2 00/17] MFD: Adjustments for several function implementations Lee Jones
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=239db775-b9e6-57f9-23af-9a1a551255e8@users.sourceforge.net \
--to=elfring@users.sourceforge.net \
--cc=kernel-janitors@vger.kernel.org \
--cc=lee.jones@linaro.org \
--cc=linux-kernel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).