aboutsummaryrefslogtreecommitdiff
path: root/drivers/mfd/da9052-i2c.c
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2012-07-13 16:24:26 +0000
committerUwe Kleine-König <u.kleine-koenig@pengutronix.de>2012-09-11 08:57:36 +0200
commite27d650b3d39e22df7359dc68401b7dca486fce3 (patch)
treee1f9571035e049967bdc5481a343c77df20710f1 /drivers/mfd/da9052-i2c.c
parenta99cc82bd61baefd8bb3110e1284629be3610c0c (diff)
downloadlinux-e27d650b3d39e22df7359dc68401b7dca486fce3.tar.gz
mfd/da9052: make i2c_device_id array const
This is possible since *of_device_id.data became const. While at it also drop a cast to const that was never needed. [ukl: split Arnd's patch by driver and add changlog] Signed-off-by: Arnd Bergmann <arnd@arndb.de> Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Diffstat (limited to 'drivers/mfd/da9052-i2c.c')
-rw-r--r--drivers/mfd/da9052-i2c.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/mfd/da9052-i2c.c b/drivers/mfd/da9052-i2c.c
index 82c9d6450286..352c58b5a90d 100644
--- a/drivers/mfd/da9052-i2c.c
+++ b/drivers/mfd/da9052-i2c.c
@@ -46,7 +46,7 @@ static int da9052_i2c_enable_multiwrite(struct da9052 *da9052)
return 0;
}
-static struct i2c_device_id da9052_i2c_id[] = {
+static const struct i2c_device_id da9052_i2c_id[] = {
{"da9052", DA9052},
{"da9053-aa", DA9053_AA},
{"da9053-ba", DA9053_BA},
@@ -104,7 +104,7 @@ static int __devinit da9052_i2c_probe(struct i2c_client *client,
const struct of_device_id *deviceid;
deviceid = of_match_node(dialog_dt_ids, np);
- id = (const struct i2c_device_id *)deviceid->data;
+ id = deviceid->data;
}
#endif