From mboxrd@z Thu Jan 1 00:00:00 1970 From: akpm@linux-foundation.org Subject: [patch 6/7] drivers/net/sfc/falcon.c: fix min() warnings Date: Wed, 29 Oct 2008 14:22:17 -0700 Message-ID: <200810292122.m9TLMHts020208@imap1.linux-foundation.org> Cc: netdev@vger.kernel.org, akpm@linux-foundation.org, bhutchings@solarflare.com, jgarzik@redhat.com To: jeff@garzik.org Return-path: Received: from smtp1.linux-foundation.org ([140.211.169.13]:50025 "EHLO smtp1.linux-foundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754865AbYJ2VX2 (ORCPT ); Wed, 29 Oct 2008 17:23:28 -0400 Sender: netdev-owner@vger.kernel.org List-ID: From: Andrew Morton 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 Cc: Jeff Garzik Signed-off-by: Andrew Morton --- 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 @@ -1685,8 +1685,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)))); @@ -1729,8 +1729,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, @@ -1764,7 +1763,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, _