* [PATCH] fpga: stratix10-soc: fix NULL vs IS_ERR() checking
@ 2021-12-11 13:43 Miaoqian Lin
2021-12-11 14:05 ` Tom Rix
0 siblings, 1 reply; 7+ messages in thread
From: Miaoqian Lin @ 2021-12-11 13:43 UTC (permalink / raw)
Cc: linmq006, Moritz Fischer, Wu Hao, Xu Yilun, Tom Rix, linux-fpga,
linux-kernel
The stratix10_svc_allocate_memory function does not return NULL. It
returns ERR_PTR(-ENOMEM). Use IS_ERR check the return value.
Signed-off-by: Miaoqian Lin <linmq006@gmail.com>
---
drivers/fpga/stratix10-soc.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/fpga/stratix10-soc.c b/drivers/fpga/stratix10-soc.c
index 047fd7f23706..2d2687a90ae6 100644
--- a/drivers/fpga/stratix10-soc.c
+++ b/drivers/fpga/stratix10-soc.c
@@ -213,7 +213,7 @@ static int s10_ops_write_init(struct fpga_manager *mgr,
/* Allocate buffers from the service layer's pool. */
for (i = 0; i < NUM_SVC_BUFS; i++) {
kbuf = stratix10_svc_allocate_memory(priv->chan, SVC_BUF_SIZE);
- if (!kbuf) {
+ if (IS_ERR(kbuf)) {
s10_free_buffers(mgr);
ret = -ENOMEM;
goto init_done;
--
2.17.1
^ permalink raw reply related [flat|nested] 7+ messages in thread* Re: [PATCH] fpga: stratix10-soc: fix NULL vs IS_ERR() checking
2021-12-11 13:43 [PATCH] fpga: stratix10-soc: fix NULL vs IS_ERR() checking Miaoqian Lin
@ 2021-12-11 14:05 ` Tom Rix
2021-12-11 14:50 ` [PATCH v2] " Miaoqian Lin
0 siblings, 1 reply; 7+ messages in thread
From: Tom Rix @ 2021-12-11 14:05 UTC (permalink / raw)
To: Miaoqian Lin; +Cc: Moritz Fischer, Wu Hao, Xu Yilun, linux-fpga, linux-kernel
On 12/11/21 5:43 AM, Miaoqian Lin wrote:
> The stratix10_svc_allocate_memory function does not return NULL. It
> returns ERR_PTR(-ENOMEM). Use IS_ERR check the return value.
>
> Signed-off-by: Miaoqian Lin <linmq006@gmail.com>
> ---
> drivers/fpga/stratix10-soc.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/fpga/stratix10-soc.c b/drivers/fpga/stratix10-soc.c
> index 047fd7f23706..2d2687a90ae6 100644
> --- a/drivers/fpga/stratix10-soc.c
> +++ b/drivers/fpga/stratix10-soc.c
> @@ -213,7 +213,7 @@ static int s10_ops_write_init(struct fpga_manager *mgr,
> /* Allocate buffers from the service layer's pool. */
> for (i = 0; i < NUM_SVC_BUFS; i++) {
> kbuf = stratix10_svc_allocate_memory(priv->chan, SVC_BUF_SIZE);
> - if (!kbuf) {
> + if (IS_ERR(kbuf)) {
> s10_free_buffers(mgr);
> ret = -ENOMEM;
This should also change to
ret = PTR_ERR(kbuf)
Tom
> goto init_done;
^ permalink raw reply [flat|nested] 7+ messages in thread* [PATCH v2] fpga: stratix10-soc: fix NULL vs IS_ERR() checking
2021-12-11 14:05 ` Tom Rix
@ 2021-12-11 14:50 ` Miaoqian Lin
2021-12-11 14:57 ` Tom Rix
0 siblings, 1 reply; 7+ messages in thread
From: Miaoqian Lin @ 2021-12-11 14:50 UTC (permalink / raw)
To: trix; +Cc: hao.wu, linmq006, linux-fpga, linux-kernel, mdf, yilun.xu
The stratix10_svc_allocate_memory function does not return NULL. It
returns ERR_PTR(-ENOMEM). Use IS_ERR check the return value.
Signed-off-by: Miaoqian Lin <linmq006@gmail.com>
---
drivers/fpga/stratix10-soc.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/fpga/stratix10-soc.c b/drivers/fpga/stratix10-soc.c
index 047fd7f23706..91212bab5871 100644
--- a/drivers/fpga/stratix10-soc.c
+++ b/drivers/fpga/stratix10-soc.c
@@ -213,9 +213,9 @@ static int s10_ops_write_init(struct fpga_manager *mgr,
/* Allocate buffers from the service layer's pool. */
for (i = 0; i < NUM_SVC_BUFS; i++) {
kbuf = stratix10_svc_allocate_memory(priv->chan, SVC_BUF_SIZE);
- if (!kbuf) {
+ if (IS_ERR(kbuf)) {
s10_free_buffers(mgr);
- ret = -ENOMEM;
+ ret = PTR_ERR(kbuf);
goto init_done;
}
--
2.17.1
^ permalink raw reply related [flat|nested] 7+ messages in thread* Re: [PATCH v2] fpga: stratix10-soc: fix NULL vs IS_ERR() checking
2021-12-11 14:50 ` [PATCH v2] " Miaoqian Lin
@ 2021-12-11 14:57 ` Tom Rix
2021-12-13 1:28 ` Xu Yilun
0 siblings, 1 reply; 7+ messages in thread
From: Tom Rix @ 2021-12-11 14:57 UTC (permalink / raw)
To: Miaoqian Lin; +Cc: hao.wu, linux-fpga, linux-kernel, mdf, yilun.xu
On 12/11/21 6:50 AM, Miaoqian Lin wrote:
> The stratix10_svc_allocate_memory function does not return NULL. It
> returns ERR_PTR(-ENOMEM). Use IS_ERR check the return value.
>
> Signed-off-by: Miaoqian Lin <linmq006@gmail.com>
> ---
> drivers/fpga/stratix10-soc.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/fpga/stratix10-soc.c b/drivers/fpga/stratix10-soc.c
> index 047fd7f23706..91212bab5871 100644
> --- a/drivers/fpga/stratix10-soc.c
> +++ b/drivers/fpga/stratix10-soc.c
> @@ -213,9 +213,9 @@ static int s10_ops_write_init(struct fpga_manager *mgr,
> /* Allocate buffers from the service layer's pool. */
> for (i = 0; i < NUM_SVC_BUFS; i++) {
> kbuf = stratix10_svc_allocate_memory(priv->chan, SVC_BUF_SIZE);
> - if (!kbuf) {
> + if (IS_ERR(kbuf)) {
> s10_free_buffers(mgr);
> - ret = -ENOMEM;
> + ret = PTR_ERR(kbuf);
Thanks!
Reviewed-by: Tom Rix <trix@redhat.com>
> goto init_done;
> }
>
^ permalink raw reply [flat|nested] 7+ messages in thread* Re: [PATCH v2] fpga: stratix10-soc: fix NULL vs IS_ERR() checking
2021-12-11 14:57 ` Tom Rix
@ 2021-12-13 1:28 ` Xu Yilun
2021-12-13 6:12 ` Wu, Hao
0 siblings, 1 reply; 7+ messages in thread
From: Xu Yilun @ 2021-12-13 1:28 UTC (permalink / raw)
To: Tom Rix; +Cc: Miaoqian Lin, hao.wu, linux-fpga, linux-kernel, mdf
On Sat, Dec 11, 2021 at 06:57:51AM -0800, Tom Rix wrote:
>
> On 12/11/21 6:50 AM, Miaoqian Lin wrote:
> > The stratix10_svc_allocate_memory function does not return NULL. It
> > returns ERR_PTR(-ENOMEM). Use IS_ERR check the return value.
> >
> > Signed-off-by: Miaoqian Lin <linmq006@gmail.com>
> > ---
> > drivers/fpga/stratix10-soc.c | 4 ++--
> > 1 file changed, 2 insertions(+), 2 deletions(-)
> >
> > diff --git a/drivers/fpga/stratix10-soc.c b/drivers/fpga/stratix10-soc.c
> > index 047fd7f23706..91212bab5871 100644
> > --- a/drivers/fpga/stratix10-soc.c
> > +++ b/drivers/fpga/stratix10-soc.c
> > @@ -213,9 +213,9 @@ static int s10_ops_write_init(struct fpga_manager *mgr,
> > /* Allocate buffers from the service layer's pool. */
> > for (i = 0; i < NUM_SVC_BUFS; i++) {
> > kbuf = stratix10_svc_allocate_memory(priv->chan, SVC_BUF_SIZE);
> > - if (!kbuf) {
> > + if (IS_ERR(kbuf)) {
> > s10_free_buffers(mgr);
> > - ret = -ENOMEM;
> > + ret = PTR_ERR(kbuf);
>
> Thanks!
>
> Reviewed-by: Tom Rix <trix@redhat.com>
Acked-by: Xu Yilun <yilun.xu@intel.com>
Thanks,
Yilun
>
> > goto init_done;
> > }
^ permalink raw reply [flat|nested] 7+ messages in thread* RE: [PATCH v2] fpga: stratix10-soc: fix NULL vs IS_ERR() checking
2021-12-13 1:28 ` Xu Yilun
@ 2021-12-13 6:12 ` Wu, Hao
2021-12-13 6:49 ` [PATCH v3] " Miaoqian Lin
0 siblings, 1 reply; 7+ messages in thread
From: Wu, Hao @ 2021-12-13 6:12 UTC (permalink / raw)
To: Xu, Yilun, Tom Rix, Miaoqian Lin; +Cc: linux-fpga, linux-kernel, mdf
> > On 12/11/21 6:50 AM, Miaoqian Lin wrote:
> > > The stratix10_svc_allocate_memory function does not return NULL. It
> > > returns ERR_PTR(-ENOMEM). Use IS_ERR check the return value.
> > >
Please add "Fixes" tag, then
Acked-by: Wu Hao <hao.wu@intel.com>
Thanks for the patch.
Hao
> > > Signed-off-by: Miaoqian Lin <linmq006@gmail.com>
> > > ---
> > > drivers/fpga/stratix10-soc.c | 4 ++--
> > > 1 file changed, 2 insertions(+), 2 deletions(-)
> > >
> > > diff --git a/drivers/fpga/stratix10-soc.c b/drivers/fpga/stratix10-soc.c
> > > index 047fd7f23706..91212bab5871 100644
> > > --- a/drivers/fpga/stratix10-soc.c
> > > +++ b/drivers/fpga/stratix10-soc.c
> > > @@ -213,9 +213,9 @@ static int s10_ops_write_init(struct fpga_manager
> *mgr,
> > > /* Allocate buffers from the service layer's pool. */
> > > for (i = 0; i < NUM_SVC_BUFS; i++) {
> > > kbuf = stratix10_svc_allocate_memory(priv->chan,
> SVC_BUF_SIZE);
> > > - if (!kbuf) {
> > > + if (IS_ERR(kbuf)) {
> > > s10_free_buffers(mgr);
> > > - ret = -ENOMEM;
> > > + ret = PTR_ERR(kbuf);
> >
> > Thanks!
> >
> > Reviewed-by: Tom Rix <trix@redhat.com>
>
> Acked-by: Xu Yilun <yilun.xu@intel.com>
>
> Thanks,
> Yilun
>
> >
> > > goto init_done;
> > > }
^ permalink raw reply [flat|nested] 7+ messages in thread* [PATCH v3] fpga: stratix10-soc: fix NULL vs IS_ERR() checking
2021-12-13 6:12 ` Wu, Hao
@ 2021-12-13 6:49 ` Miaoqian Lin
0 siblings, 0 replies; 7+ messages in thread
From: Miaoqian Lin @ 2021-12-13 6:49 UTC (permalink / raw)
To: hao.wu; +Cc: linmq006, linux-fpga, linux-kernel, mdf, trix, yilun.xu
The stratix10_svc_allocate_memory function does not return NULL. It
returns ERR_PTR(-ENOMEM). Use IS_ERR check the return value.
Fixes: e7eef1d7633a("fpga: add intel stratix10 soc fpga manager driver")
Signed-off-by: Miaoqian Lin <linmq006@gmail.com>
Reviewed-by: Tom Rix <trix@redhat.com>
Acked-by: Xu Yilun <yilun.xu@intel.com>
Acked-by: Wu Hao <hao.wu@intel.com>
---
drivers/fpga/stratix10-soc.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/fpga/stratix10-soc.c b/drivers/fpga/stratix10-soc.c
index 047fd7f23706..91212bab5871 100644
--- a/drivers/fpga/stratix10-soc.c
+++ b/drivers/fpga/stratix10-soc.c
@@ -213,9 +213,9 @@ static int s10_ops_write_init(struct fpga_manager *mgr,
/* Allocate buffers from the service layer's pool. */
for (i = 0; i < NUM_SVC_BUFS; i++) {
kbuf = stratix10_svc_allocate_memory(priv->chan, SVC_BUF_SIZE);
- if (!kbuf) {
+ if (IS_ERR(kbuf)) {
s10_free_buffers(mgr);
- ret = -ENOMEM;
+ ret = PTR_ERR(kbuf);
goto init_done;
}
--
2.17.1
^ permalink raw reply related [flat|nested] 7+ messages in thread
end of thread, other threads:[~2021-12-13 6:49 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-12-11 13:43 [PATCH] fpga: stratix10-soc: fix NULL vs IS_ERR() checking Miaoqian Lin
2021-12-11 14:05 ` Tom Rix
2021-12-11 14:50 ` [PATCH v2] " Miaoqian Lin
2021-12-11 14:57 ` Tom Rix
2021-12-13 1:28 ` Xu Yilun
2021-12-13 6:12 ` Wu, Hao
2021-12-13 6:49 ` [PATCH v3] " Miaoqian Lin
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).