diff options
author | Lee Jones <lee.jones@linaro.org> | 2014-07-02 06:54:32 -0400 |
---|---|---|
committer | Lee Jones <lee.jones@linaro.org> | 2014-07-09 11:37:55 -0400 |
commit | c00572bc94684a61628a7f6f34f5ce64345742cc (patch) | |
tree | a99495b701316c554a049cfa1133d63368f06920 /drivers/mfd/stmpe-i2c.c | |
parent | 52764fd9ab5e1fa0d7e159ce6147d0288be595a7 (diff) |
mfd: stmpe: Rid data size incompatibility warn when building for 64bit
Extinguishes:
../drivers/mfd/stmpe-i2c.c: In function ‘stmpe_i2c_probe’:
../drivers/mfd/stmpe-i2c.c:88:13:
warning: cast from pointer to integer of different size
partnum = (int)of_id->data;
Reviewed-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Lee Jones <lee.jones@linaro.org>
Diffstat (limited to 'drivers/mfd/stmpe-i2c.c')
-rw-r--r-- | drivers/mfd/stmpe-i2c.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/mfd/stmpe-i2c.c b/drivers/mfd/stmpe-i2c.c index a45f9c0a330a..5c054031c3f8 100644 --- a/drivers/mfd/stmpe-i2c.c +++ b/drivers/mfd/stmpe-i2c.c | |||
@@ -68,7 +68,7 @@ MODULE_DEVICE_TABLE(of, stmpe_of_match); | |||
68 | static int | 68 | static int |
69 | stmpe_i2c_probe(struct i2c_client *i2c, const struct i2c_device_id *id) | 69 | stmpe_i2c_probe(struct i2c_client *i2c, const struct i2c_device_id *id) |
70 | { | 70 | { |
71 | int partnum; | 71 | enum stmpe_partnum partnum; |
72 | const struct of_device_id *of_id; | 72 | const struct of_device_id *of_id; |
73 | 73 | ||
74 | i2c_ci.data = (void *)id; | 74 | i2c_ci.data = (void *)id; |
@@ -85,7 +85,7 @@ stmpe_i2c_probe(struct i2c_client *i2c, const struct i2c_device_id *id) | |||
85 | dev_info(&i2c->dev, "matching on node name, compatible is preferred\n"); | 85 | dev_info(&i2c->dev, "matching on node name, compatible is preferred\n"); |
86 | partnum = id->driver_data; | 86 | partnum = id->driver_data; |
87 | } else | 87 | } else |
88 | partnum = (int)of_id->data; | 88 | partnum = (enum stmpe_partnum)of_id->data; |
89 | 89 | ||
90 | return stmpe_probe(&i2c_ci, partnum); | 90 | return stmpe_probe(&i2c_ci, partnum); |
91 | } | 91 | } |