Commit c34924b9 authored May 08, 2013 by Geert Uytterhoeven Committed by Samuel Ortiz May 16, 2013

mfd: cros_ec_spi: Use %z to format pointer differences

Before commit 5c29e47e ("mfd: cros_ec_spi:
Warnings fix"), 64-bit compiles gave the following warnings:

drivers/mfd/cros_ec_spi.c: In function 'cros_ec_spi_receive_response':
drivers/mfd/cros_ec_spi.c:123:5: warning: format '%d' expects argument of type 'int', but argument 4 has type 'long int' [-Wformat]
drivers/mfd/cros_ec_spi.c:157:3: warning: format '%d' expects argument of type 'int', but argument 6 has type 'long int' [-Wformat]
drivers/mfd/cros_ec_spi.c:181:2: warning: format '%d' expects argument of type 'int', but argument 4 has type 'long int' [-Wformat]

After that commit, 32-bit compiles give:

drivers/mfd/cros_ec_spi.c: In function ‘cros_ec_spi_receive_response’:
drivers/mfd/cros_ec_spi.c:123: warning: format ‘%ld’ expects type ‘long int’, but argument 4 has type ‘int’
drivers/mfd/cros_ec_spi.c:157: warning: format ‘%ld’ expects type ‘long int’, but argument 6 has type ‘int’
drivers/mfd/cros_ec_spi.c:181: warning: format ‘%ld’ expects type ‘long int’, but argument 4 has type ‘int’

Use %z to format pointer differences to kill the warnings on both 32-bit
and 64-bit.

Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>

parent b0222afa

drivers/mfd/cros_ec_spi.c

+3 −3

Original line number	Diff line number	Diff line
		@@ -120,7 +120,7 @@ static int cros_ec_spi_receive_response(struct cros_ec_device *ec_dev,

		for (end = ptr + EC_MSG_PREAMBLE_COUNT; ptr != end; ptr++) {
		if (*ptr == EC_MSG_HEADER) {
		dev_dbg(ec_dev->dev, "msg found at %ld\n",
		dev_dbg(ec_dev->dev, "msg found at %zd\n",
		ptr - ec_dev->din);
		break;
		}
		@@ -154,7 +154,7 @@ static int cros_ec_spi_receive_response(struct cros_ec_device *ec_dev,
		* maximum-supported transfer size.
		*/
		todo = min(need_len, 256);
		dev_dbg(ec_dev->dev, "loop, todo=%d, need_len=%d, ptr=%ld\n",
		dev_dbg(ec_dev->dev, "loop, todo=%d, need_len=%d, ptr=%zd\n",
		todo, need_len, ptr - ec_dev->din);

		memset(&trans, '\0', sizeof(trans));
		@@ -178,7 +178,7 @@ static int cros_ec_spi_receive_response(struct cros_ec_device *ec_dev,
		need_len -= todo;
		}

		dev_dbg(ec_dev->dev, "loop done, ptr=%ld\n", ptr - ec_dev->din);
		dev_dbg(ec_dev->dev, "loop done, ptr=%zd\n", ptr - ec_dev->din);

		return 0;
		}