leandrof/u-boot
1
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

spi: cf_qspi: fix clamp macro type check compilation warnings

Browse Source 
Fix compilation warnings for redefined 'clamp' macro and non-uniform
clamp macro types.

Signed-off-by: Angelo Dureghello <angelo@sysam.it>
Reviewed-by: Jagannadh Teki <jteki@openedev.com>
This commit is contained in:
Angelo Dureghello 2015-06-21 23:40:46 +02:00 committed by Jagan Teki
parent 23cbd16db6
commit 8aa5f1d971
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
drivers/spi/cf_qspi.c
View File

@ -19,7 +19,6 @@
DECLARE_GLOBAL_DATA_PTR; 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) #define to_cf_qspi_slave(s) container_of(s, struct cf_qspi_slave, slave)
struct cf_qspi_slave { struct cf_qspi_slave {
@ -120,7 +119,7 @@ struct spi_slave *spi_setup_slave(unsigned int bus, unsigned int cs,
dev->qmr = 2u; dev->qmr = 2u;
else /* Get the closest baud rate */ else /* Get the closest baud rate */
dev->qmr = clamp(((gd->bus_clk >> 2) + max_hz - 1)/max_hz, dev->qmr = clamp(((gd->bus_clk >> 2) + max_hz - 1)/max_hz,
2u, 255u); 2lu, 255lu);
/* Map mode to QMR[CPOL] and QMR[CPHA] */ /* Map mode to QMR[CPOL] and QMR[CPHA] */
if (mode & SPI_CPOL) if (mode & SPI_CPOL)