* [PATCH v2] mtd: nand: nandsim: fix error check
@ 2016-11-16 8:02 Sudip Mukherjee
2016-11-19 18:35 ` Boris Brezillon
0 siblings, 1 reply; 2+ messages in thread
From: Sudip Mukherjee @ 2016-11-16 8:02 UTC (permalink / raw)
To: Boris Brezillon, Richard Weinberger, David Woodhouse,
Brian Norris, Marek Vasut, Cyrille Pitchen
Cc: linux-kernel, linux-mtd, Sudip Mukherjee
debugfs_create_dir() and debugfs_create_file() returns NULL on error or
a pointer on success. They do not return the error value with ERR_PTR.
So we should not check the return with IS_ERR_OR_NULL, instead we
should just check for NULL.
Signed-off-by: Sudip Mukherjee <sudip.mukherjee@codethink.co.uk>
---
v2: nuked err
drivers/mtd/nand/nandsim.c | 15 +++++----------
1 file changed, 5 insertions(+), 10 deletions(-)
diff --git a/drivers/mtd/nand/nandsim.c b/drivers/mtd/nand/nandsim.c
index c76287a..c847426 100644
--- a/drivers/mtd/nand/nandsim.c
+++ b/drivers/mtd/nand/nandsim.c
@@ -525,24 +525,20 @@ static int nandsim_debugfs_create(struct nandsim *dev)
{
struct nandsim_debug_info *dbg = &dev->dbg;
struct dentry *dent;
- int err;
if (!IS_ENABLED(CONFIG_DEBUG_FS))
return 0;
dent = debugfs_create_dir("nandsim", NULL);
- if (IS_ERR_OR_NULL(dent)) {
- int err = dent ? -ENODEV : PTR_ERR(dent);
-
- NS_ERR("cannot create \"nandsim\" debugfs directory, err %d\n",
- err);
- return err;
+ if (!dent) {
+ NS_ERR("cannot create \"nandsim\" debugfs directory\n");
+ return -ENODEV;
}
dbg->dfs_root = dent;
dent = debugfs_create_file("wear_report", S_IRUSR,
dbg->dfs_root, dev, &dfs_fops);
- if (IS_ERR_OR_NULL(dent))
+ if (!dent)
goto out_remove;
dbg->dfs_wear_report = dent;
@@ -550,8 +546,7 @@ static int nandsim_debugfs_create(struct nandsim *dev)
out_remove:
debugfs_remove_recursive(dbg->dfs_root);
- err = dent ? PTR_ERR(dent) : -ENODEV;
- return err;
+ return -ENODEV;
}
/**
--
1.9.1
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH v2] mtd: nand: nandsim: fix error check
2016-11-16 8:02 [PATCH v2] mtd: nand: nandsim: fix error check Sudip Mukherjee
@ 2016-11-19 18:35 ` Boris Brezillon
0 siblings, 0 replies; 2+ messages in thread
From: Boris Brezillon @ 2016-11-19 18:35 UTC (permalink / raw)
To: Sudip Mukherjee
Cc: Richard Weinberger, David Woodhouse, Brian Norris, Marek Vasut,
Cyrille Pitchen, linux-kernel, linux-mtd
On Wed, 16 Nov 2016 08:02:55 +0000
Sudip Mukherjee <sudipm.mukherjee@gmail.com> wrote:
> debugfs_create_dir() and debugfs_create_file() returns NULL on error or
> a pointer on success. They do not return the error value with ERR_PTR.
> So we should not check the return with IS_ERR_OR_NULL, instead we
> should just check for NULL.
>
> Signed-off-by: Sudip Mukherjee <sudip.mukherjee@codethink.co.uk>
Applied.
Thanks,
Boris
> ---
>
> v2: nuked err
>
> drivers/mtd/nand/nandsim.c | 15 +++++----------
> 1 file changed, 5 insertions(+), 10 deletions(-)
>
> diff --git a/drivers/mtd/nand/nandsim.c b/drivers/mtd/nand/nandsim.c
> index c76287a..c847426 100644
> --- a/drivers/mtd/nand/nandsim.c
> +++ b/drivers/mtd/nand/nandsim.c
> @@ -525,24 +525,20 @@ static int nandsim_debugfs_create(struct nandsim *dev)
> {
> struct nandsim_debug_info *dbg = &dev->dbg;
> struct dentry *dent;
> - int err;
>
> if (!IS_ENABLED(CONFIG_DEBUG_FS))
> return 0;
>
> dent = debugfs_create_dir("nandsim", NULL);
> - if (IS_ERR_OR_NULL(dent)) {
> - int err = dent ? -ENODEV : PTR_ERR(dent);
> -
> - NS_ERR("cannot create \"nandsim\" debugfs directory, err %d\n",
> - err);
> - return err;
> + if (!dent) {
> + NS_ERR("cannot create \"nandsim\" debugfs directory\n");
> + return -ENODEV;
> }
> dbg->dfs_root = dent;
>
> dent = debugfs_create_file("wear_report", S_IRUSR,
> dbg->dfs_root, dev, &dfs_fops);
> - if (IS_ERR_OR_NULL(dent))
> + if (!dent)
> goto out_remove;
> dbg->dfs_wear_report = dent;
>
> @@ -550,8 +546,7 @@ static int nandsim_debugfs_create(struct nandsim *dev)
>
> out_remove:
> debugfs_remove_recursive(dbg->dfs_root);
> - err = dent ? PTR_ERR(dent) : -ENODEV;
> - return err;
> + return -ENODEV;
> }
>
> /**
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2016-11-19 18:35 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-11-16 8:02 [PATCH v2] mtd: nand: nandsim: fix error check Sudip Mukherjee
2016-11-19 18:35 ` Boris Brezillon
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).