| Message ID | 20241114165558.49043-1-visitorckw@gmail.com (mailing list archive) |
|---|---|
| State | New |
| Delegated to: | Brendan Higgins |
| Headers | show |
| Series | kunit: debugfs: Use IS_ERR() for alloc_string_stream() error check | expand |
On Fri, 15 Nov 2024 at 00:56, Kuan-Wei Chiu <visitorckw@gmail.com> wrote: > > The alloc_string_stream() function only returns ERR_PTR(-ENOMEM) on > failure and never returns NULL. Therefore, switching the error check in > the caller from IS_ERR_OR_NULL to IS_ERR improves clarity, indicating > that this function will return an error pointer (not NULL) when an > error occurs. This change avoids any ambiguity regarding the function's > return behavior. > > Link: https://lore.kernel.org/lkml/Zy9deU5VK3YR+r9N@visitorckw-System-Product-Name > Signed-off-by: Kuan-Wei Chiu <visitorckw@gmail.com> > -- Makes sense to me, thanks. Reviewed-by: David Gow <davidgow@google.com> Cheers, -- David > lib/kunit/debugfs.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/lib/kunit/debugfs.c b/lib/kunit/debugfs.c > index d548750a325a..6273fa9652df 100644 > --- a/lib/kunit/debugfs.c > +++ b/lib/kunit/debugfs.c > @@ -181,7 +181,7 @@ void kunit_debugfs_create_suite(struct kunit_suite *suite) > * successfully. > */ > stream = alloc_string_stream(GFP_KERNEL); > - if (IS_ERR_OR_NULL(stream)) > + if (IS_ERR(stream)) > return; > > string_stream_set_append_newlines(stream, true); > @@ -189,7 +189,7 @@ void kunit_debugfs_create_suite(struct kunit_suite *suite) > > kunit_suite_for_each_test_case(suite, test_case) { > stream = alloc_string_stream(GFP_KERNEL); > - if (IS_ERR_OR_NULL(stream)) > + if (IS_ERR(stream)) > goto err; > > string_stream_set_append_newlines(stream, true); > -- > 2.34.1 >
diff --git a/lib/kunit/debugfs.c b/lib/kunit/debugfs.c index d548750a325a..6273fa9652df 100644 --- a/lib/kunit/debugfs.c +++ b/lib/kunit/debugfs.c @@ -181,7 +181,7 @@ void kunit_debugfs_create_suite(struct kunit_suite *suite) * successfully. */ stream = alloc_string_stream(GFP_KERNEL); - if (IS_ERR_OR_NULL(stream)) + if (IS_ERR(stream)) return; string_stream_set_append_newlines(stream, true); @@ -189,7 +189,7 @@ void kunit_debugfs_create_suite(struct kunit_suite *suite) kunit_suite_for_each_test_case(suite, test_case) { stream = alloc_string_stream(GFP_KERNEL); - if (IS_ERR_OR_NULL(stream)) + if (IS_ERR(stream)) goto err; string_stream_set_append_newlines(stream, true);
The alloc_string_stream() function only returns ERR_PTR(-ENOMEM) on failure and never returns NULL. Therefore, switching the error check in the caller from IS_ERR_OR_NULL to IS_ERR improves clarity, indicating that this function will return an error pointer (not NULL) when an error occurs. This change avoids any ambiguity regarding the function's return behavior. Link: https://lore.kernel.org/lkml/Zy9deU5VK3YR+r9N@visitorckw-System-Product-Name Signed-off-by: Kuan-Wei Chiu <visitorckw@gmail.com> --- lib/kunit/debugfs.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)