[v2] drivers: i2c: silence a compile warning in i2c-s3c2410.c
diff mbox

Message ID 1389750162-5765-1-git-send-email-y@samsung.com
State Not Applicable, archived
Headers show

Commit Message

y@samsung.com Jan. 15, 2014, 1:42 a.m. UTC
From: Pankaj Dubey <pankaj.dubey@samsung.com>

If used 64 bit compiler GCC warns that:

drivers/i2c/busses/i2c-s3c2410.c: In function ‘s3c24xx_get_device_quirks’:
drivers/i2c/busses/i2c-s3c2410.c:168:10: warning: cast from pointer to integer
of different size [-Wpointer-to-int-cast]

This patch fixes this by converting "unsigned int" to "kernel_ulong_t".

CC: Kukjin Kim <kgene.kim@samsung.com>
CC: Wolfram Sang <wsa@the-dreams.de>
CC: linux-i2c@vger.kernel.org
Signed-off-by: Pankaj Dubey <pankaj.dubey@samsung.com>

Changes since v1:
    - using "kernel_ulong_t" instead of "unsigned long" for consistency.
    - take care of formatting issues as pointed by Wolfram Sang.

 drivers/i2c/busses/i2c-s3c2410.c |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)


Wolfram Sang Jan. 16, 2014, 10:21 a.m. UTC | #1
On Wed, Jan 15, 2014 at 10:42:42AM +0900, y@samsung.com wrote:

Note that your email address is wrong here. I also fixed the description
to "i2c: s3c2410: fix quirk usage for 64-bit" which is more apropriate.

Other than that: Applied to for-next, thanks!

diff mbox

diff --git a/drivers/i2c/busses/i2c-s3c2410.c b/drivers/i2c/busses/i2c-s3c2410.c
index bf8fb94..168de17 100644
--- a/drivers/i2c/busses/i2c-s3c2410.c
+++ b/drivers/i2c/busses/i2c-s3c2410.c
@@ -101,7 +101,7 @@  enum s3c24xx_i2c_state {
 struct s3c24xx_i2c {
 	wait_queue_head_t	wait;
-	unsigned int            quirks;
+	kernel_ulong_t		quirks;
 	unsigned int		suspended:1;
 	struct i2c_msg		*msg;
@@ -160,12 +160,12 @@  MODULE_DEVICE_TABLE(of, s3c24xx_i2c_match);
  * Get controller type either from device tree or platform device variant.
-static inline unsigned int s3c24xx_get_device_quirks(struct platform_device *pdev)
+static inline kernel_ulong_t s3c24xx_get_device_quirks(struct platform_device *pdev)
 	if (pdev->dev.of_node) {
 		const struct of_device_id *match;
 		match = of_match_node(s3c24xx_i2c_match, pdev->dev.of_node);
-		return (unsigned int)match->data;
+		return (kernel_ulong_t)match->data;
 	return platform_get_device_id(pdev)->driver_data;