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>

diff --git a/drivers/mfd/da9052-i2c.c b/drivers/mfd/da9052-i2c.c
index 82c9d64502868ba94ea8d215d9a5e864ed42f19a..352c58b5a90d2406e8467bfdacfbd2ba5fefa1b6 100644 (file)
--- 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