summaryrefslogtreecommitdiffstats
path: root/drivers/mfd/stmpe-i2c.c
diff options
context:
space:
mode:
authorLee Jones <lee.jones@linaro.org>2014-07-02 11:54:32 +0100
committerLee Jones <lee.jones@linaro.org>2014-07-09 16:37:55 +0100
commitc00572bc94684a61628a7f6f34f5ce64345742cc (patch)
treea99495b701316c554a049cfa1133d63368f06920 /drivers/mfd/stmpe-i2c.c
parent52764fd9ab5e1fa0d7e159ce6147d0288be595a7 (diff)
downloadlinux-c00572bc94684a61628a7f6f34f5ce64345742cc.tar.gz
linux-c00572bc94684a61628a7f6f34f5ce64345742cc.tar.bz2
linux-c00572bc94684a61628a7f6f34f5ce64345742cc.zip
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.c4
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);
static int
stmpe_i2c_probe(struct i2c_client *i2c, const struct i2c_device_id *id)
{
- int partnum;
+ enum stmpe_partnum partnum;
const struct of_device_id *of_id;
i2c_ci.data = (void *)id;
@@ -85,7 +85,7 @@ stmpe_i2c_probe(struct i2c_client *i2c, const struct i2c_device_id *id)
dev_info(&i2c->dev, "matching on node name, compatible is preferred\n");
partnum = id->driver_data;
} else
- partnum = (int)of_id->data;
+ partnum = (enum stmpe_partnum)of_id->data;
return stmpe_probe(&i2c_ci, partnum);
}