From patchwork Mon Jul 23 09:13:27 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [22/25] mfd/da9052: make i2c_device_id array const From: =?utf-8?q?Uwe_Kleine-K=C3=B6nig?= X-Patchwork-Id: 172594 Message-Id: <1343034810-3386-23-git-send-email-u.kleine-koenig@pengutronix.de> To: Grant Likely , Arnd Bergmann , Rob Herring , Samuel Ortiz Cc: linux-arm-kernel@lists.infradead.org, kernel@pengutronix.de Date: Mon, 23 Jul 2012 11:13:27 +0200 From: Arnd Bergmann 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 Signed-off-by: Uwe Kleine-König --- drivers/mfd/da9052-i2c.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/mfd/da9052-i2c.c b/drivers/mfd/da9052-i2c.c index 82c9d64..352c58b 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