From: Bartosz Golaszewski <brgl@bgdev.pl>
To: Linus Walleij <linus.walleij@linaro.org>,
Bamvor Jian Zhang <bamvor.zhangjian@linaro.org>
Cc: linux-gpio@vger.kernel.org, linux-kernel@vger.kernel.org,
Bartosz Golaszewski <brgl@bgdev.pl>
Subject: [PATCH 12/18] gpio: mockup: fix debugfs handling
Date: Mon, 27 Nov 2017 11:48:48 +0100 [thread overview]
Message-ID: <20171127104854.333-13-brgl@bgdev.pl> (raw)
In-Reply-To: <20171127104854.333-1-brgl@bgdev.pl>
The debugfs routines returning pointers can return NULL or error codes
embedded with ERR_PTR(). Check the return values with IS_ERR_OR_NULL().
While we're at it: make the error message more specific so it's not
confused with the one emitted when the top-level gpio-mockup debugfs
directory creation fails.
Signed-off-by: Bartosz Golaszewski <brgl@bgdev.pl>
---
drivers/gpio/gpio-mockup.c | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/drivers/gpio/gpio-mockup.c b/drivers/gpio/gpio-mockup.c
index dba5e79e3278..68a0c1e06a16 100644
--- a/drivers/gpio/gpio-mockup.c
+++ b/drivers/gpio/gpio-mockup.c
@@ -183,11 +183,11 @@ static void gpio_mockup_debugfs_setup(struct device *dev,
devname = dev_name(&gc->gpiodev->dev);
chip->dbg_dir = debugfs_create_dir(devname, gpio_mockup_dbg_dir);
- if (!chip->dbg_dir)
+ if (IS_ERR_OR_NULL(chip->dbg_dir))
goto err;
link = debugfs_create_symlink(gc->label, gpio_mockup_dbg_dir, devname);
- if (!link)
+ if (IS_ERR_OR_NULL(link))
goto err;
for (i = 0; i < gc->ngpio; i++) {
@@ -205,14 +205,14 @@ static void gpio_mockup_debugfs_setup(struct device *dev,
evfile = debugfs_create_file(name, 0200, chip->dbg_dir, priv,
&gpio_mockup_event_ops);
- if (!evfile)
+ if (IS_ERR_OR_NULL(evfile))
goto err;
}
return;
err:
- dev_err(dev, "error creating debugfs directory\n");
+ dev_err(dev, "error creating debugfs event files\n");
}
static int gpio_mockup_name_lines(struct device *dev,
@@ -336,7 +336,7 @@ static int __init gpio_mockup_init(void)
num_chips = gpio_mockup_params_nr / 2;
gpio_mockup_dbg_dir = debugfs_create_dir("gpio-mockup-event", NULL);
- if (!gpio_mockup_dbg_dir)
+ if (IS_ERR_OR_NULL(gpio_mockup_dbg_dir))
gpio_mockup_err("error creating debugfs directory\n");
err = platform_driver_register(&gpio_mockup_driver);
--
2.15.0
next prev parent reply other threads:[~2017-11-27 10:58 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-11-27 10:48 [PATCH 00/18] gpio: mockup: updates for v4.16 Bartosz Golaszewski
2017-11-27 10:48 ` [PATCH 01/18] gpio: mockup: add missing prefixes Bartosz Golaszewski
2017-11-27 10:48 ` [PATCH 02/18] gpio: mockup: parse the module params in init, not probe Bartosz Golaszewski
2017-11-27 10:48 ` [PATCH 03/18] gpio: mockup: verify the number of GPIO chips requested Bartosz Golaszewski
2017-11-27 10:48 ` [PATCH 04/18] gpio: mockup: rework device probing Bartosz Golaszewski
2017-11-27 10:48 ` [PATCH 05/18] gpio: mockup: implement gpio_mockup_err() Bartosz Golaszewski
2017-11-27 10:48 ` [PATCH 06/18] gpio: mockup: remove a stray tab Bartosz Golaszewski
2017-11-27 10:48 ` [PATCH 07/18] gpio: mockup: merge gpio_mockup_add() into gpio_mockup_probe() Bartosz Golaszewski
2017-11-27 10:48 ` [PATCH 08/18] gpio: mockup: pass the named_lines parameter over platform_data Bartosz Golaszewski
2017-11-27 10:48 ` [PATCH 09/18] gpio: mockup: extend the debugfs layout Bartosz Golaszewski
2017-11-27 10:48 ` [PATCH 10/18] gpio: mockup: change the type of value field in line state struct Bartosz Golaszewski
2017-11-27 10:48 ` [PATCH 11/18] gpio: mockup: group code by logic Bartosz Golaszewski
2017-11-27 10:48 ` Bartosz Golaszewski [this message]
2017-11-27 10:48 ` [PATCH 13/18] gpio: mockup: verify that ngpio > 0 Bartosz Golaszewski
2017-11-27 10:48 ` [PATCH 14/18] gpio: mockup: tweak line breaks Bartosz Golaszewski
2017-11-27 10:48 ` [PATCH 15/18] gpio: mockup: implement gpio_mockup_set_multiple() Bartosz Golaszewski
2017-11-27 10:48 ` [PATCH 16/18] gpio: mockup: modify the return value check for devm_irq_sim_init() Bartosz Golaszewski
2017-11-27 10:48 ` [PATCH 17/18] gpio: mockup: rename gpio_mockup_params_nr to gpio_mockup_num_ranges Bartosz Golaszewski
2017-11-27 10:48 ` [PATCH 18/18] gpio: mockup: add helpers for accessing the gpio ranges Bartosz Golaszewski
2017-12-01 19:38 ` [PATCH 00/18] gpio: mockup: updates for v4.16 Linus Walleij
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=20171127104854.333-13-brgl@bgdev.pl \
--to=brgl@bgdev.pl \
--cc=bamvor.zhangjian@linaro.org \
--cc=linus.walleij@linaro.org \
--cc=linux-gpio@vger.kernel.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