spi: nxp-fspi: Use min macro

[PATCH v1] spi: nxp-fspi: Use min macro

Posted by Yan Zhen 1 year, 3 months ago

When the original file is guaranteed to contain the minmax.h header file
and compile correctly, using the real macro is usually 
more intuitive and readable.

Signed-off-by: Yan Zhen <yanzhen@vivo.com>
---
 drivers/spi/spi-nxp-fspi.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/drivers/spi/spi-nxp-fspi.c b/drivers/spi/spi-nxp-fspi.c
index 88397f712a3b..fda902aa5815 100644
--- a/drivers/spi/spi-nxp-fspi.c
+++ b/drivers/spi/spi-nxp-fspi.c
@@ -756,8 +756,7 @@ static int nxp_fspi_read_ahb(struct nxp_fspi *f, const struct spi_mem_op *op)
 			iounmap(f->ahb_addr);
 
 		f->memmap_start = start;
-		f->memmap_len = len > NXP_FSPI_MIN_IOMAP ?
-				len : NXP_FSPI_MIN_IOMAP;
+		f->memmap_len = max(len, NXP_FSPI_MIN_IOMAP);
 
 		f->ahb_addr = ioremap(f->memmap_phy + f->memmap_start,
 					 f->memmap_len);
-- 
2.34.1

Re: [PATCH v1] spi: nxp-fspi: Use min macro

Posted by Michael Walle 1 year, 3 months ago

Hi,

On Tue Aug 27, 2024 at 10:57 AM CEST, Yan Zhen wrote:
> When the original file is guaranteed to contain the minmax.h header file
> and compile correctly, using the real macro is usually 
> more intuitive and readable.

The subject doesn't match what you're doing here. Also, shouldn't
one use max_t()?

-michael

>
> Signed-off-by: Yan Zhen <yanzhen@vivo.com>
> ---
>  drivers/spi/spi-nxp-fspi.c | 3 +--
>  1 file changed, 1 insertion(+), 2 deletions(-)
>
> diff --git a/drivers/spi/spi-nxp-fspi.c b/drivers/spi/spi-nxp-fspi.c
> index 88397f712a3b..fda902aa5815 100644
> --- a/drivers/spi/spi-nxp-fspi.c
> +++ b/drivers/spi/spi-nxp-fspi.c
> @@ -756,8 +756,7 @@ static int nxp_fspi_read_ahb(struct nxp_fspi *f, const struct spi_mem_op *op)
>  			iounmap(f->ahb_addr);
>  
>  		f->memmap_start = start;
> -		f->memmap_len = len > NXP_FSPI_MIN_IOMAP ?
> -				len : NXP_FSPI_MIN_IOMAP;
> +		f->memmap_len = max(len, NXP_FSPI_MIN_IOMAP);
>  
>  		f->ahb_addr = ioremap(f->memmap_phy + f->memmap_start,
>  					 f->memmap_len);

RE: [PATCH v1] spi: nxp-fspi: Use min macro

Posted by David Laight 1 year, 3 months ago

From: Michael Walle
> Sent: 27 August 2024 12:58
> 
> Hi,
> 
> On Tue Aug 27, 2024 at 10:57 AM CEST, Yan Zhen wrote:
> > When the original file is guaranteed to contain the minmax.h header file
> > and compile correctly, using the real macro is usually
> > more intuitive and readable.
> 
> The subject doesn't match what you're doing here. Also, shouldn't
> one use max_t()?

You should pretty much never use max_t().
Using it is just an accident waiting to happen.

	David

> 
> -michael
> 
> >
> > Signed-off-by: Yan Zhen <yanzhen@vivo.com>
> > ---
> >  drivers/spi/spi-nxp-fspi.c | 3 +--
> >  1 file changed, 1 insertion(+), 2 deletions(-)
> >
> > diff --git a/drivers/spi/spi-nxp-fspi.c b/drivers/spi/spi-nxp-fspi.c
> > index 88397f712a3b..fda902aa5815 100644
> > --- a/drivers/spi/spi-nxp-fspi.c
> > +++ b/drivers/spi/spi-nxp-fspi.c
> > @@ -756,8 +756,7 @@ static int nxp_fspi_read_ahb(struct nxp_fspi *f, const struct spi_mem_op *op)
> >  			iounmap(f->ahb_addr);
> >
> >  		f->memmap_start = start;
> > -		f->memmap_len = len > NXP_FSPI_MIN_IOMAP ?
> > -				len : NXP_FSPI_MIN_IOMAP;
> > +		f->memmap_len = max(len, NXP_FSPI_MIN_IOMAP);
> >
> >  		f->ahb_addr = ioremap(f->memmap_phy + f->memmap_start,
> >  					 f->memmap_len);

-
Registered Address Lakeside, Bramley Road, Mount Farm, Milton Keynes, MK1 1PT, UK
Registration No: 1397386 (Wales)