Skip to content

Commit

Permalink
mfd/da9052: make i2c_device_id array const
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Arnd Bergmann authored and Uwe Kleine-König committed Sep 11, 2012
1 parent a99cc82 commit e27d650
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions drivers/mfd/da9052-i2c.c
Original file line number Diff line number Diff line change
Expand Up @@ -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},
Expand Down Expand Up @@ -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

Expand Down

0 comments on commit e27d650

Please sign in to comment.