diff options
author | Arnd Bergmann <arnd@arndb.de> | 2012-07-13 12:24:26 -0400 |
---|---|---|
committer | Uwe Kleine-König <u.kleine-koenig@pengutronix.de> | 2012-09-11 02:57:36 -0400 |
commit | e27d650b3d39e22df7359dc68401b7dca486fce3 (patch) | |
tree | e1f9571035e049967bdc5481a343c77df20710f1 | |
parent | a99cc82bd61baefd8bb3110e1284629be3610c0c (diff) |
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>
-rw-r--r-- | drivers/mfd/da9052-i2c.c | 4 |
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) | |||
46 | return 0; | 46 | return 0; |
47 | } | 47 | } |
48 | 48 | ||
49 | static struct i2c_device_id da9052_i2c_id[] = { | 49 | static const struct i2c_device_id da9052_i2c_id[] = { |
50 | {"da9052", DA9052}, | 50 | {"da9052", DA9052}, |
51 | {"da9053-aa", DA9053_AA}, | 51 | {"da9053-aa", DA9053_AA}, |
52 | {"da9053-ba", DA9053_BA}, | 52 | {"da9053-ba", DA9053_BA}, |
@@ -104,7 +104,7 @@ static int __devinit da9052_i2c_probe(struct i2c_client *client, | |||
104 | const struct of_device_id *deviceid; | 104 | const struct of_device_id *deviceid; |
105 | 105 | ||
106 | deviceid = of_match_node(dialog_dt_ids, np); | 106 | deviceid = of_match_node(dialog_dt_ids, np); |
107 | id = (const struct i2c_device_id *)deviceid->data; | 107 | id = deviceid->data; |
108 | } | 108 | } |
109 | #endif | 109 | #endif |
110 | 110 | ||