From: Darshan Rathod <darshanrathod475@gmail.com>

Refactor cxl_mem_get_poison() to assign the return value of
ACQUIRE_ERR() before the conditional check, instead of performing the
assignment inside the if condition. This resolves a checkpatch.pl
warning ("do not use assignment in if condition") and improves
readability.

Signed-off-by: Darshan Rathod <darshanrathod475@gmail.com>
---
 drivers/cxl/core/mbox.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/drivers/cxl/core/mbox.c b/drivers/cxl/core/mbox.c
index fa6dd0c94656..9c5066631896 100644
--- a/drivers/cxl/core/mbox.c
+++ b/drivers/cxl/core/mbox.c
@@ -1426,7 +1426,9 @@ int cxl_mem_get_poison(struct cxl_memdev *cxlmd, u64 offset, u64 len,
 	int rc;
 
 	ACQUIRE(mutex_intr, lock)(&mds->poison.mutex);
-	if ((rc = ACQUIRE_ERR(mutex_intr, &lock)))
+
+	rc = ACQUIRE_ERR(mutex_intr, &lock);
+	if (rc)
 		return rc;
 
 	po = mds->poison.list_out;
-- 
2.25.1

On Wed, 13 Aug 2025 17:25:54 +0530
darshanrathod475@gmail.com wrote:

> From: Darshan Rathod <darshanrathod475@gmail.com>
> 
> Refactor cxl_mem_get_poison() to assign the return value of
> ACQUIRE_ERR() before the conditional check, instead of performing the
> assignment inside the if condition. This resolves a checkpatch.pl
> warning ("do not use assignment in if condition") and improves
> readability.
> 
> Signed-off-by: Darshan Rathod <darshanrathod475@gmail.com>
See:
https://lore.kernel.org/all/20250813003821.2891532-1-alison.schofield@intel.com/

Which stops checkpatch complaining about this.
Let's see where that discussion ends up before considering 'fixing' this.

Jonathan

> ---
>  drivers/cxl/core/mbox.c | 4 +++-
>  1 file changed, 3 insertions(+), 1 deletion(-)
> 
> diff --git a/drivers/cxl/core/mbox.c b/drivers/cxl/core/mbox.c
> index fa6dd0c94656..9c5066631896 100644
> --- a/drivers/cxl/core/mbox.c
> +++ b/drivers/cxl/core/mbox.c
> @@ -1426,7 +1426,9 @@ int cxl_mem_get_poison(struct cxl_memdev *cxlmd, u64 offset, u64 len,
>  	int rc;
>  
>  	ACQUIRE(mutex_intr, lock)(&mds->poison.mutex);
> -	if ((rc = ACQUIRE_ERR(mutex_intr, &lock)))
> +
> +	rc = ACQUIRE_ERR(mutex_intr, &lock);
> +	if (rc)
>  		return rc;
>  
>  	po = mds->poison.list_out;

Hi Jonathan,

Thanks for pointing that out.
I’ll hold off on this change and wait for the outcome of Alison’s
patch discussion before proceeding further.

Regards,
Darshan

On Wed, Aug 13, 2025 at 6:22 PM Jonathan Cameron
<Jonathan.Cameron@huawei.com> wrote:
>
> On Wed, 13 Aug 2025 17:25:54 +0530
> darshanrathod475@gmail.com wrote:
>
> > From: Darshan Rathod <darshanrathod475@gmail.com>
> >
> > Refactor cxl_mem_get_poison() to assign the return value of
> > ACQUIRE_ERR() before the conditional check, instead of performing the
> > assignment inside the if condition. This resolves a checkpatch.pl
> > warning ("do not use assignment in if condition") and improves
> > readability.
> >
> > Signed-off-by: Darshan Rathod <darshanrathod475@gmail.com>
> See:
> https://lore.kernel.org/all/20250813003821.2891532-1-alison.schofield@intel.com/
>
> Which stops checkpatch complaining about this.
> Let's see where that discussion ends up before considering 'fixing' this.
>
> Jonathan
>
> > ---
> >  drivers/cxl/core/mbox.c | 4 +++-
> >  1 file changed, 3 insertions(+), 1 deletion(-)
> >
> > diff --git a/drivers/cxl/core/mbox.c b/drivers/cxl/core/mbox.c
> > index fa6dd0c94656..9c5066631896 100644
> > --- a/drivers/cxl/core/mbox.c
> > +++ b/drivers/cxl/core/mbox.c
> > @@ -1426,7 +1426,9 @@ int cxl_mem_get_poison(struct cxl_memdev *cxlmd, u64 offset, u64 len,
> >       int rc;
> >
> >       ACQUIRE(mutex_intr, lock)(&mds->poison.mutex);
> > -     if ((rc = ACQUIRE_ERR(mutex_intr, &lock)))
> > +
> > +     rc = ACQUIRE_ERR(mutex_intr, &lock);
> > +     if (rc)
> >               return rc;
> >
> >       po = mds->poison.list_out;
>