drivers/net/sfc/falcon.c: fix min() warnings
Subsystems (2)
PATCH 21/21 drivers/net/sfc/falcon.c: fix min() warnings
From: Andrew Morton <[email protected]>
drivers/net/sfc/falcon.c: In function 'falcon_spi_write_limit':drivers/net/sfc/falcon.c:1679: warning: comparison of distinct pointer types lacks a cast drivers/net/sfc/falcon.c: In function 'falcon_spi_read':drivers/net/sfc/falcon.c:1720: warning: comparison of distinct pointer types lacks a cast
Driver seems rather confused about types. Try to help it.
Cc Ben Hutchings <[email protected]>
Cc Jeff Garzik <[email protected]>
Signed-off-by Andrew Morton <[email protected]>
---
drivers/net/sfc/falcon.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-)
drivers/net/sfc/falcon.c renamed from drivers/net/sfc/falcon.c~drivers-net-sfc-falconc-fix-min-warnings +4 -5
@@ -1673,8 +1673,8 @@ static int falcon_spi_cmd(const struct ereturn 0 ; } -static unsigned int -falcon_spi_write_limit (const struct efx_spi_device *spi,unsigned int start) +static size_t +falcon_spi_write_limit (const struct efx_spi_device *spi,size_t start) {return min (FALCON_SPI_MAX_LEN , (spi->block_size - (start & (spi->block_size -1 ))));
@@ -1717,8 +1717,7 @@ int falcon_spi_read(const struct efx_spiint rc =0 ;while (pos < len) { - block_len =min ((unsigned int )len - pos, -FALCON_SPI_MAX_LEN ); + block_len =min (len - pos,FALCON_SPI_MAX_LEN ); command =efx_spi_munge_command (spi,SPI_READ , start + pos); rc = falcon_spi_cmd(spi, command, start + pos, NULL,
@@ -1752,7 +1751,7 @@ int falcon_spi_write(const struct efx_spif (rc)break ; - block_len =min ((unsigned int )len - pos, + block_len =min (len - pos,falcon_spi_write_limit (spi, start + pos)); command =efx_spi_munge_command (spi,SPI_WRITE , start + pos); rc = falcon_spi_cmd(spi, command, start + pos,
_