* [PATCH] mtd: nand: nandsim: fix error check
@ 2016-11-15 23:09 Sudip Mukherjee
2016-11-15 23:42 ` Marek Vasut
0 siblings, 1 reply; 7+ messages in thread
From: Sudip Mukherjee @ 2016-11-15 23:09 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>
---
drivers/mtd/nand/nandsim.c | 9 +++------
1 file changed, 3 insertions(+), 6 deletions(-)
diff --git a/drivers/mtd/nand/nandsim.c b/drivers/mtd/nand/nandsim.c
index c76287a..9b0d79a 100644
--- a/drivers/mtd/nand/nandsim.c
+++ b/drivers/mtd/nand/nandsim.c
@@ -525,15 +525,13 @@ static int nandsim_debugfs_create(struct nandsim *dev)
{
struct nandsim_debug_info *dbg = &dev->dbg;
struct dentry *dent;
- int err;
+ int err = -ENODEV;
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);
-
+ if (!dent) {
NS_ERR("cannot create \"nandsim\" debugfs directory, err %d\n",
err);
return err;
@@ -542,7 +540,7 @@ static int nandsim_debugfs_create(struct nandsim *dev)
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,7 +548,6 @@ static int nandsim_debugfs_create(struct nandsim *dev)
out_remove:
debugfs_remove_recursive(dbg->dfs_root);
- err = dent ? PTR_ERR(dent) : -ENODEV;
return err;
}
--
1.9.1
^ permalink raw reply related [flat|nested] 7+ messages in thread
* Re: [PATCH] mtd: nand: nandsim: fix error check
2016-11-15 23:09 [PATCH] mtd: nand: nandsim: fix error check Sudip Mukherjee
@ 2016-11-15 23:42 ` Marek Vasut
2016-11-16 7:52 ` Sudip Mukherjee
0 siblings, 1 reply; 7+ messages in thread
From: Marek Vasut @ 2016-11-15 23:42 UTC (permalink / raw)
To: Sudip Mukherjee, Boris Brezillon, Richard Weinberger,
David Woodhouse, Brian Norris, Cyrille Pitchen
Cc: linux-kernel, linux-mtd
On 11/16/2016 12:09 AM, Sudip Mukherjee 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>
> ---
> drivers/mtd/nand/nandsim.c | 9 +++------
> 1 file changed, 3 insertions(+), 6 deletions(-)
>
> diff --git a/drivers/mtd/nand/nandsim.c b/drivers/mtd/nand/nandsim.c
> index c76287a..9b0d79a 100644
> --- a/drivers/mtd/nand/nandsim.c
> +++ b/drivers/mtd/nand/nandsim.c
> @@ -525,15 +525,13 @@ static int nandsim_debugfs_create(struct nandsim *dev)
> {
> struct nandsim_debug_info *dbg = &dev->dbg;
> struct dentry *dent;
> - int err;
> + int err = -ENODEV;
Why don't you just nuke the err altogether and just return -ENODEV ?
> 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);
> -
> + if (!dent) {
> NS_ERR("cannot create \"nandsim\" debugfs directory, err %d\n",
> err);
> return err;
> @@ -542,7 +540,7 @@ static int nandsim_debugfs_create(struct nandsim *dev)
>
> 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,7 +548,6 @@ static int nandsim_debugfs_create(struct nandsim *dev)
>
> out_remove:
> debugfs_remove_recursive(dbg->dfs_root);
> - err = dent ? PTR_ERR(dent) : -ENODEV;
> return err;
> }
>
>
--
Best regards,
Marek Vasut
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH] mtd: nand: nandsim: fix error check
2016-11-15 23:42 ` Marek Vasut
@ 2016-11-16 7:52 ` Sudip Mukherjee
2016-11-16 16:56 ` Marek Vasut
0 siblings, 1 reply; 7+ messages in thread
From: Sudip Mukherjee @ 2016-11-16 7:52 UTC (permalink / raw)
To: Marek Vasut, Boris Brezillon, Richard Weinberger,
David Woodhouse, Brian Norris, Cyrille Pitchen
Cc: linux-kernel, linux-mtd
On Tuesday 15 November 2016 11:42 PM, Marek Vasut wrote:
> On 11/16/2016 12:09 AM, Sudip Mukherjee 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>
>> ---
>> drivers/mtd/nand/nandsim.c | 9 +++------
>> 1 file changed, 3 insertions(+), 6 deletions(-)
>>
>> diff --git a/drivers/mtd/nand/nandsim.c b/drivers/mtd/nand/nandsim.c
>> index c76287a..9b0d79a 100644
>> --- a/drivers/mtd/nand/nandsim.c
>> +++ b/drivers/mtd/nand/nandsim.c
>> @@ -525,15 +525,13 @@ static int nandsim_debugfs_create(struct nandsim *dev)
>> {
>> struct nandsim_debug_info *dbg = &dev->dbg;
>> struct dentry *dent;
>> - int err;
>> + int err = -ENODEV;
>
> Why don't you just nuke the err altogether and just return -ENODEV ?
That was the first version which i made and discarded before sending. I
will go and find it now.
Regards
Sudip
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH] mtd: nand: nandsim: fix error check
2016-11-16 7:52 ` Sudip Mukherjee
@ 2016-11-16 16:56 ` Marek Vasut
2016-11-16 20:56 ` Sudip Mukherjee
0 siblings, 1 reply; 7+ messages in thread
From: Marek Vasut @ 2016-11-16 16:56 UTC (permalink / raw)
To: Sudip Mukherjee, Boris Brezillon, Richard Weinberger,
David Woodhouse, Brian Norris, Cyrille Pitchen
Cc: linux-kernel, linux-mtd
On 11/16/2016 08:52 AM, Sudip Mukherjee wrote:
> On Tuesday 15 November 2016 11:42 PM, Marek Vasut wrote:
>> On 11/16/2016 12:09 AM, Sudip Mukherjee 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>
>>> ---
>>> drivers/mtd/nand/nandsim.c | 9 +++------
>>> 1 file changed, 3 insertions(+), 6 deletions(-)
>>>
>>> diff --git a/drivers/mtd/nand/nandsim.c b/drivers/mtd/nand/nandsim.c
>>> index c76287a..9b0d79a 100644
>>> --- a/drivers/mtd/nand/nandsim.c
>>> +++ b/drivers/mtd/nand/nandsim.c
>>> @@ -525,15 +525,13 @@ static int nandsim_debugfs_create(struct
>>> nandsim *dev)
>>> {
>>> struct nandsim_debug_info *dbg = &dev->dbg;
>>> struct dentry *dent;
>>> - int err;
>>> + int err = -ENODEV;
>>
>> Why don't you just nuke the err altogether and just return -ENODEV ?
>
> That was the first version which i made and discarded before sending. I
> will go and find it now.
Why did you discard it ?
--
Best regards,
Marek Vasut
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH] mtd: nand: nandsim: fix error check
2016-11-16 16:56 ` Marek Vasut
@ 2016-11-16 20:56 ` Sudip Mukherjee
2016-11-17 13:21 ` Marek Vasut
0 siblings, 1 reply; 7+ messages in thread
From: Sudip Mukherjee @ 2016-11-16 20:56 UTC (permalink / raw)
To: Marek Vasut, Boris Brezillon, Richard Weinberger,
David Woodhouse, Brian Norris, Cyrille Pitchen
Cc: linux-kernel, linux-mtd
On Wednesday 16 November 2016 04:56 PM, Marek Vasut wrote:
> On 11/16/2016 08:52 AM, Sudip Mukherjee wrote:
>> On Tuesday 15 November 2016 11:42 PM, Marek Vasut wrote:
>>> On 11/16/2016 12:09 AM, Sudip Mukherjee 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>
>>>> ---
>>>> drivers/mtd/nand/nandsim.c | 9 +++------
>>>> 1 file changed, 3 insertions(+), 6 deletions(-)
>>>>
>>>> diff --git a/drivers/mtd/nand/nandsim.c b/drivers/mtd/nand/nandsim.c
>>>> index c76287a..9b0d79a 100644
>>>> --- a/drivers/mtd/nand/nandsim.c
>>>> +++ b/drivers/mtd/nand/nandsim.c
>>>> @@ -525,15 +525,13 @@ static int nandsim_debugfs_create(struct
>>>> nandsim *dev)
>>>> {
>>>> struct nandsim_debug_info *dbg = &dev->dbg;
>>>> struct dentry *dent;
>>>> - int err;
>>>> + int err = -ENODEV;
>>>
>>> Why don't you just nuke the err altogether and just return -ENODEV ?
>>
>> That was the first version which i made and discarded before sending. I
>> will go and find it now.
>
> Why did you discard it ?
>
That is actually a stupid reason. I was confused with the print
statement which uses err.
NS_ERR("cannot create \"nandsim\" debugfs directory, err %d\n",
err);
Regards
Sudip
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH] mtd: nand: nandsim: fix error check
2016-11-16 20:56 ` Sudip Mukherjee
@ 2016-11-17 13:21 ` Marek Vasut
2016-11-17 17:22 ` Sudip Mukherjee
0 siblings, 1 reply; 7+ messages in thread
From: Marek Vasut @ 2016-11-17 13:21 UTC (permalink / raw)
To: Sudip Mukherjee, Boris Brezillon, Richard Weinberger,
David Woodhouse, Brian Norris, Cyrille Pitchen
Cc: linux-kernel, linux-mtd
On 11/16/2016 09:56 PM, Sudip Mukherjee wrote:
> On Wednesday 16 November 2016 04:56 PM, Marek Vasut wrote:
>> On 11/16/2016 08:52 AM, Sudip Mukherjee wrote:
>>> On Tuesday 15 November 2016 11:42 PM, Marek Vasut wrote:
>>>> On 11/16/2016 12:09 AM, Sudip Mukherjee 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>
>>>>> ---
>>>>> drivers/mtd/nand/nandsim.c | 9 +++------
>>>>> 1 file changed, 3 insertions(+), 6 deletions(-)
>>>>>
>>>>> diff --git a/drivers/mtd/nand/nandsim.c b/drivers/mtd/nand/nandsim.c
>>>>> index c76287a..9b0d79a 100644
>>>>> --- a/drivers/mtd/nand/nandsim.c
>>>>> +++ b/drivers/mtd/nand/nandsim.c
>>>>> @@ -525,15 +525,13 @@ static int nandsim_debugfs_create(struct
>>>>> nandsim *dev)
>>>>> {
>>>>> struct nandsim_debug_info *dbg = &dev->dbg;
>>>>> struct dentry *dent;
>>>>> - int err;
>>>>> + int err = -ENODEV;
>>>>
>>>> Why don't you just nuke the err altogether and just return -ENODEV ?
>>>
>>> That was the first version which i made and discarded before sending. I
>>> will go and find it now.
>>
>> Why did you discard it ?
>>
>
> That is actually a stupid reason. I was confused with the print
> statement which uses err.
>
> NS_ERR("cannot create \"nandsim\" debugfs directory, err %d\n",
> err);
>
Ah, got it, so yeah, nuke the err altogether :)
--
Best regards,
Marek Vasut
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH] mtd: nand: nandsim: fix error check
2016-11-17 13:21 ` Marek Vasut
@ 2016-11-17 17:22 ` Sudip Mukherjee
0 siblings, 0 replies; 7+ messages in thread
From: Sudip Mukherjee @ 2016-11-17 17:22 UTC (permalink / raw)
To: Marek Vasut, Boris Brezillon, Richard Weinberger,
David Woodhouse, Brian Norris, Cyrille Pitchen
Cc: linux-kernel, linux-mtd
On Thursday 17 November 2016 01:21 PM, Marek Vasut wrote:
> On 11/16/2016 09:56 PM, Sudip Mukherjee wrote:
>> On Wednesday 16 November 2016 04:56 PM, Marek Vasut wrote:
>>> On 11/16/2016 08:52 AM, Sudip Mukherjee wrote:
>>>> On Tuesday 15 November 2016 11:42 PM, Marek Vasut wrote:
>>>>> On 11/16/2016 12:09 AM, Sudip Mukherjee 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>
>>>>>> ---
>>>>>> drivers/mtd/nand/nandsim.c | 9 +++------
>>>>>> 1 file changed, 3 insertions(+), 6 deletions(-)
>>>>>>
>>>>>> diff --git a/drivers/mtd/nand/nandsim.c b/drivers/mtd/nand/nandsim.c
>>>>>> index c76287a..9b0d79a 100644
>>>>>> --- a/drivers/mtd/nand/nandsim.c
>>>>>> +++ b/drivers/mtd/nand/nandsim.c
>>>>>> @@ -525,15 +525,13 @@ static int nandsim_debugfs_create(struct
>>>>>> nandsim *dev)
>>>>>> {
>>>>>> struct nandsim_debug_info *dbg = &dev->dbg;
>>>>>> struct dentry *dent;
>>>>>> - int err;
>>>>>> + int err = -ENODEV;
>>>>>
>>>>> Why don't you just nuke the err altogether and just return -ENODEV ?
>>>>
>>>> That was the first version which i made and discarded before sending. I
>>>> will go and find it now.
>>>
>>> Why did you discard it ?
>>>
>>
>> That is actually a stupid reason. I was confused with the print
>> statement which uses err.
>>
>> NS_ERR("cannot create \"nandsim\" debugfs directory, err %d\n",
>> err);
>>
>
> Ah, got it, so yeah, nuke the err altogether :)
v2 is already sent yesterday.
Regards
Sudip
^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2016-11-17 17:22 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-11-15 23:09 [PATCH] mtd: nand: nandsim: fix error check Sudip Mukherjee
2016-11-15 23:42 ` Marek Vasut
2016-11-16 7:52 ` Sudip Mukherjee
2016-11-16 16:56 ` Marek Vasut
2016-11-16 20:56 ` Sudip Mukherjee
2016-11-17 13:21 ` Marek Vasut
2016-11-17 17:22 ` Sudip Mukherjee
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).