diff options
author | Pankaj Dubey <pankaj.dubey@samsung.com> | 2014-01-14 20:42:42 -0500 |
---|---|---|
committer | Wolfram Sang <wsa@the-dreams.de> | 2014-01-16 05:18:24 -0500 |
commit | 5f1b11555ef21fb3a8a9d21a2e5914e2bc1b9d9b (patch) | |
tree | be748241a26cb28e02ffa1ab96d4ee3ba06da0ce | |
parent | d1ccc125f348ff31dd7954ae718e73ba1c884da9 (diff) |
i2c: s3c2410: fix quirk usage for 64-bit
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".
Signed-off-by: Pankaj Dubey <pankaj.dubey@samsung.com>
Signed-off-by: Wolfram Sang <wsa@the-dreams.de>
-rw-r--r-- | drivers/i2c/busses/i2c-s3c2410.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/i2c/busses/i2c-s3c2410.c b/drivers/i2c/busses/i2c-s3c2410.c index db39d87bdc55..684d21e71e4a 100644 --- a/drivers/i2c/busses/i2c-s3c2410.c +++ b/drivers/i2c/busses/i2c-s3c2410.c | |||
@@ -102,7 +102,7 @@ enum s3c24xx_i2c_state { | |||
102 | 102 | ||
103 | struct s3c24xx_i2c { | 103 | struct s3c24xx_i2c { |
104 | wait_queue_head_t wait; | 104 | wait_queue_head_t wait; |
105 | unsigned int quirks; | 105 | kernel_ulong_t quirks; |
106 | unsigned int suspended:1; | 106 | unsigned int suspended:1; |
107 | 107 | ||
108 | struct i2c_msg *msg; | 108 | struct i2c_msg *msg; |
@@ -165,12 +165,12 @@ MODULE_DEVICE_TABLE(of, s3c24xx_i2c_match); | |||
165 | * Get controller type either from device tree or platform device variant. | 165 | * Get controller type either from device tree or platform device variant. |
166 | */ | 166 | */ |
167 | 167 | ||
168 | static inline unsigned int s3c24xx_get_device_quirks(struct platform_device *pdev) | 168 | static inline kernel_ulong_t s3c24xx_get_device_quirks(struct platform_device *pdev) |
169 | { | 169 | { |
170 | if (pdev->dev.of_node) { | 170 | if (pdev->dev.of_node) { |
171 | const struct of_device_id *match; | 171 | const struct of_device_id *match; |
172 | match = of_match_node(s3c24xx_i2c_match, pdev->dev.of_node); | 172 | match = of_match_node(s3c24xx_i2c_match, pdev->dev.of_node); |
173 | return (unsigned int)match->data; | 173 | return (kernel_ulong_t)match->data; |
174 | } | 174 | } |
175 | 175 | ||
176 | return platform_get_device_id(pdev)->driver_data; | 176 | return platform_get_device_id(pdev)->driver_data; |