diff options
author | Uwe Kleine-König <u.kleine-koenig@pengutronix.de> | 2014-10-13 18:52:39 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-10-13 20:18:17 -0400 |
commit | a28885bc75da0aac61b975eb9c103407dbdf5cb5 (patch) | |
tree | cfda4d285b0f159cecf396a9585de846ad6bc452 | |
parent | 78230477656295808c66226880d794818694e7f1 (diff) |
rtc: make of_device_ids const
of_device_ids (i.e. compatible strings and the respective data) are not
supposed to change at runtime. All functions working with of_device_ids
provided by <linux/of.h> work with const of_device_ids. This allows to
mark all struct of_device_id below drivers/rtc const, too.
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r-- | drivers/rtc/rtc-isl12022.c | 2 | ||||
-rw-r--r-- | drivers/rtc/rtc-mpc5121.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/rtc/rtc-isl12022.c b/drivers/rtc/rtc-isl12022.c index aa55f081c505..ee3ba7e6b45e 100644 --- a/drivers/rtc/rtc-isl12022.c +++ b/drivers/rtc/rtc-isl12022.c | |||
@@ -274,7 +274,7 @@ static int isl12022_probe(struct i2c_client *client, | |||
274 | } | 274 | } |
275 | 275 | ||
276 | #ifdef CONFIG_OF | 276 | #ifdef CONFIG_OF |
277 | static struct of_device_id isl12022_dt_match[] = { | 277 | static const struct of_device_id isl12022_dt_match[] = { |
278 | { .compatible = "isl,isl12022" }, | 278 | { .compatible = "isl,isl12022" }, |
279 | { }, | 279 | { }, |
280 | }; | 280 | }; |
diff --git a/drivers/rtc/rtc-mpc5121.c b/drivers/rtc/rtc-mpc5121.c index dc4f14255cc3..3b965ad6f4d5 100644 --- a/drivers/rtc/rtc-mpc5121.c +++ b/drivers/rtc/rtc-mpc5121.c | |||
@@ -401,7 +401,7 @@ static int mpc5121_rtc_remove(struct platform_device *op) | |||
401 | } | 401 | } |
402 | 402 | ||
403 | #ifdef CONFIG_OF | 403 | #ifdef CONFIG_OF |
404 | static struct of_device_id mpc5121_rtc_match[] = { | 404 | static const struct of_device_id mpc5121_rtc_match[] = { |
405 | { .compatible = "fsl,mpc5121-rtc", }, | 405 | { .compatible = "fsl,mpc5121-rtc", }, |
406 | { .compatible = "fsl,mpc5200-rtc", }, | 406 | { .compatible = "fsl,mpc5200-rtc", }, |
407 | {}, | 407 | {}, |