[patch 21/21] drivers/net/sfc/falcon.c: fix min() warnings
From: akpm@linux-foundation.org
Date: 2008-09-22 21:54:36
From: Andrew Morton <akpm@linux-foundation.org> 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 <redacted> Cc: Jeff Garzik <redacted> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> --- drivers/net/sfc/falcon.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff -puN drivers/net/sfc/falcon.c~drivers-net-sfc-falconc-fix-min-warnings drivers/net/sfc/falcon.c
--- a/drivers/net/sfc/falcon.c~drivers-net-sfc-falconc-fix-min-warnings
+++ a/drivers/net/sfc/falcon.c@@ -1673,8 +1673,8 @@ static int falcon_spi_cmd(const struct e return 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_spi int 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_sp if (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,
_