On 21 June 2015 at 14:39, Angelo Dureghello <[email protected]> wrote: > > > On 19/06/2015 09:43, Jagan Teki wrote: >> >> On 5 June 2015 at 04:53, Angelo Dureghello <[email protected]> wrote: >>> >>> Fix clamp macro redefined warning, and clamp type check warnings. >>> >>> Signed-off-by: Angelo Dureghello <[email protected]> >>> --- >>> drivers/spi/cf_qspi.c | 3 +-- >>> 1 file changed, 1 insertion(+), 2 deletions(-) >>> >>> diff --git a/drivers/spi/cf_qspi.c b/drivers/spi/cf_qspi.c >>> index 834c5bd..c4bafe0 100644 >>> --- a/drivers/spi/cf_qspi.c >>> +++ b/drivers/spi/cf_qspi.c >>> @@ -19,7 +19,6 @@ >>> >>> DECLARE_GLOBAL_DATA_PTR; >>> >>> -#define clamp(x, low, high) (min(max(low, x), high)) >>> #define to_cf_qspi_slave(s) container_of(s, struct cf_qspi_slave, >>> slave) >>> >>> struct cf_qspi_slave { >>> @@ -119,7 +118,7 @@ struct spi_slave *spi_setup_slave(unsigned int bus, >>> unsigned int cs, >>> if (max_hz == 0) /* Go as fast as possible */ >>> dev->qmr = 2u; >>> else /* Get the closest baud rate */ >>> - dev->qmr = clamp(((gd->bus_clk >> 2) + max_hz - >>> 1)/max_hz, >>> + dev->qmr = clamp_val(((gd->bus_clk >> 2) + max_hz - >>> 1)/max_hz, >> >> >> Yes, there is a common macro in include/linux - can you check this >> clamp or clamp_val and >> test it accordingly. >> > > Hi Jagan, > > i realized the warnings was correctly generated from the "unnecessary" > pointer comparison used from the clamp/min/max macros. > > More correct solution here is to set 2u, 255u to 2lu, 255lu, and > types are compliant to the comparison, so warnings are not thrown anymore. > > The clamp macro defined in this file seems anyway still not needed (redefine > warning) since it is exactly the same in the commonly used > include/linux/kernel.h clamp macro. > > So i post a v2 version of the patch with these 2 changes. Ok ?
Yes, please. thanks! -- Jagan | openedev. _______________________________________________ U-Boot mailing list [email protected] http://lists.denx.de/mailman/listinfo/u-boot
