Piteball/android_kernel_google_msm
1
0
Fork 0
mirror of https://github.com/followmsi/android_kernel_google_msm.git synced 2024-11-06 23:17:41 +00:00
Code Issues Projects Releases Wiki Activity

mfd: stmpe: Rid data size incompatibility warn when building for 64bit

Browse source 
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>
This commit is contained in:
Lee Jones 2014-07-02 11:54:32 +01:00
parent 52764fd9ab
commit c00572bc94
3 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
drivers/mfd/stmpe-i2c.c
View file

@ -68,7 +68,7 @@ MODULE_DEVICE_TABLE(of, stmpe_of_match);
static int static int
stmpe_i2c_probe(struct i2c_client *i2c, const struct i2c_device_id *id) 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; const struct of_device_id *of_id;
i2c_ci.data = (void *)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"); dev_info(&i2c->dev, "matching on node name, compatible is preferred\n");
partnum = id->driver_data; partnum = id->driver_data;
} else } else
partnum = (int)of_id->data; partnum = (enum stmpe_partnum)of_id->data;
return stmpe_probe(&i2c_ci, partnum); return stmpe_probe(&i2c_ci, partnum);
} }

2
drivers/mfd/stmpe.c
View file

@ -1147,7 +1147,7 @@ static void stmpe_of_probe(struct stmpe_platform_data *pdata,
} }
/* Called from client specific probe routines */ /* Called from client specific probe routines */
int stmpe_probe(struct stmpe_client_info *ci, int partnum) int stmpe_probe(struct stmpe_client_info *ci, enum stmpe_partnum partnum)
{ {
struct stmpe_platform_data *pdata = dev_get_platdata(ci->dev); struct stmpe_platform_data *pdata = dev_get_platdata(ci->dev);
struct device_node *np = ci->dev->of_node; struct device_node *np = ci->dev->of_node;

2
drivers/mfd/stmpe.h
View file

@ -97,7 +97,7 @@ struct stmpe_client_info {
void (*init)(struct stmpe *stmpe); void (*init)(struct stmpe *stmpe);
}; };
int stmpe_probe(struct stmpe_client_info *ci, int partnum); int stmpe_probe(struct stmpe_client_info *ci, enum stmpe_partnum partnum);
int stmpe_remove(struct stmpe *stmpe); int stmpe_remove(struct stmpe *stmpe);
#define STMPE_ICR_LSB_HIGH (1 << 2) #define STMPE_ICR_LSB_HIGH (1 << 2)