projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ahci: Fix compiling warnings under 64bit platforms
[oweals/u-boot.git]
/
drivers
/
spi
/
cf_qspi.c
diff --git
a/drivers/spi/cf_qspi.c
b/drivers/spi/cf_qspi.c
index 6b8563366b8ee40d500066a6039b0bfad180ea78..e57e63eb47a0f63989dff7fbd1e242c413668e6f 100644
(file)
--- a/
drivers/spi/cf_qspi.c
+++ b/
drivers/spi/cf_qspi.c
@@
-19,8
+19,7
@@
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, s)
+#define to_cf_qspi_slave(s) container_of(s, struct cf_qspi_slave, slave)
struct cf_qspi_slave {
struct spi_slave slave; /* Specific bus:cs ID for each device */
struct cf_qspi_slave {
struct spi_slave slave; /* Specific bus:cs ID for each device */
@@
-120,7
+119,7
@@
struct spi_slave *spi_setup_slave(unsigned int bus, unsigned int cs,
dev->qmr = 2u;
else /* Get the closest baud rate */
dev->qmr = clamp(((gd->bus_clk >> 2) + max_hz - 1)/max_hz,
dev->qmr = 2u;
else /* Get the closest baud rate */
dev->qmr = clamp(((gd->bus_clk >> 2) + max_hz - 1)/max_hz,
- 2
u, 255
u);
+ 2
lu, 255l
u);
/* Map mode to QMR[CPOL] and QMR[CPHA] */
if (mode & SPI_CPOL)
/* Map mode to QMR[CPOL] and QMR[CPHA] */
if (mode & SPI_CPOL)