diff options
-rw-r--r-- | drivers/power/charger-manager.c | 2 | ||||
-rw-r--r-- | drivers/power/reset/at91-poweroff.c | 2 | ||||
-rw-r--r-- | drivers/power/reset/at91-reset.c | 4 | ||||
-rw-r--r-- | drivers/power/reset/hisi-reboot.c | 2 | ||||
-rw-r--r-- | drivers/power/reset/keystone-reset.c | 2 | ||||
-rw-r--r-- | drivers/power/reset/st-poweroff.c | 2 | ||||
-rw-r--r-- | drivers/power/reset/syscon-reboot.c | 2 | ||||
-rw-r--r-- | drivers/power/reset/vexpress-poweroff.c | 2 | ||||
-rw-r--r-- | drivers/power/reset/xgene-reboot.c | 2 | ||||
-rw-r--r-- | drivers/power/tps65090-charger.c | 2 |
10 files changed, 11 insertions, 11 deletions
diff --git a/drivers/power/charger-manager.c b/drivers/power/charger-manager.c index e23b7ba2cbd2..5933c1a585f4 100644 --- a/drivers/power/charger-manager.c +++ b/drivers/power/charger-manager.c | |||
@@ -1484,7 +1484,7 @@ static int cm_init_thermal_data(struct charger_manager *cm, | |||
1484 | return ret; | 1484 | return ret; |
1485 | } | 1485 | } |
1486 | 1486 | ||
1487 | static struct of_device_id charger_manager_match[] = { | 1487 | static const struct of_device_id charger_manager_match[] = { |
1488 | { | 1488 | { |
1489 | .compatible = "charger-manager", | 1489 | .compatible = "charger-manager", |
1490 | }, | 1490 | }, |
diff --git a/drivers/power/reset/at91-poweroff.c b/drivers/power/reset/at91-poweroff.c index 4b72ea51c364..9847cfb7e23d 100644 --- a/drivers/power/reset/at91-poweroff.c +++ b/drivers/power/reset/at91-poweroff.c | |||
@@ -140,7 +140,7 @@ static int at91_poweroff_probe(struct platform_device *pdev) | |||
140 | return 0; | 140 | return 0; |
141 | } | 141 | } |
142 | 142 | ||
143 | static struct of_device_id at91_poweroff_of_match[] = { | 143 | static const struct of_device_id at91_poweroff_of_match[] = { |
144 | { .compatible = "atmel,at91sam9260-shdwc", }, | 144 | { .compatible = "atmel,at91sam9260-shdwc", }, |
145 | { .compatible = "atmel,at91sam9rl-shdwc", }, | 145 | { .compatible = "atmel,at91sam9rl-shdwc", }, |
146 | { .compatible = "atmel,at91sam9x5-shdwc", }, | 146 | { .compatible = "atmel,at91sam9x5-shdwc", }, |
diff --git a/drivers/power/reset/at91-reset.c b/drivers/power/reset/at91-reset.c index 13584e24736a..68b18962f73a 100644 --- a/drivers/power/reset/at91-reset.c +++ b/drivers/power/reset/at91-reset.c | |||
@@ -152,14 +152,14 @@ static void __init at91_reset_status(struct platform_device *pdev) | |||
152 | pr_info("AT91: Starting after %s\n", reason); | 152 | pr_info("AT91: Starting after %s\n", reason); |
153 | } | 153 | } |
154 | 154 | ||
155 | static struct of_device_id at91_ramc_of_match[] = { | 155 | static const struct of_device_id at91_ramc_of_match[] = { |
156 | { .compatible = "atmel,at91sam9260-sdramc", }, | 156 | { .compatible = "atmel,at91sam9260-sdramc", }, |
157 | { .compatible = "atmel,at91sam9g45-ddramc", }, | 157 | { .compatible = "atmel,at91sam9g45-ddramc", }, |
158 | { .compatible = "atmel,sama5d3-ddramc", }, | 158 | { .compatible = "atmel,sama5d3-ddramc", }, |
159 | { /* sentinel */ } | 159 | { /* sentinel */ } |
160 | }; | 160 | }; |
161 | 161 | ||
162 | static struct of_device_id at91_reset_of_match[] = { | 162 | static const struct of_device_id at91_reset_of_match[] = { |
163 | { .compatible = "atmel,at91sam9260-rstc", .data = at91sam9260_restart }, | 163 | { .compatible = "atmel,at91sam9260-rstc", .data = at91sam9260_restart }, |
164 | { .compatible = "atmel,at91sam9g45-rstc", .data = at91sam9g45_restart }, | 164 | { .compatible = "atmel,at91sam9g45-rstc", .data = at91sam9g45_restart }, |
165 | { /* sentinel */ } | 165 | { /* sentinel */ } |
diff --git a/drivers/power/reset/hisi-reboot.c b/drivers/power/reset/hisi-reboot.c index 5385460e23bb..9ab7f562a83b 100644 --- a/drivers/power/reset/hisi-reboot.c +++ b/drivers/power/reset/hisi-reboot.c | |||
@@ -64,7 +64,7 @@ static int hisi_reboot_probe(struct platform_device *pdev) | |||
64 | return err; | 64 | return err; |
65 | } | 65 | } |
66 | 66 | ||
67 | static struct of_device_id hisi_reboot_of_match[] = { | 67 | static const struct of_device_id hisi_reboot_of_match[] = { |
68 | { .compatible = "hisilicon,sysctrl" }, | 68 | { .compatible = "hisilicon,sysctrl" }, |
69 | {} | 69 | {} |
70 | }; | 70 | }; |
diff --git a/drivers/power/reset/keystone-reset.c b/drivers/power/reset/keystone-reset.c index faedf16c8111..c70f1bffe038 100644 --- a/drivers/power/reset/keystone-reset.c +++ b/drivers/power/reset/keystone-reset.c | |||
@@ -70,7 +70,7 @@ static struct notifier_block rsctrl_restart_nb = { | |||
70 | .priority = 128, | 70 | .priority = 128, |
71 | }; | 71 | }; |
72 | 72 | ||
73 | static struct of_device_id rsctrl_of_match[] = { | 73 | static const struct of_device_id rsctrl_of_match[] = { |
74 | {.compatible = "ti,keystone-reset", }, | 74 | {.compatible = "ti,keystone-reset", }, |
75 | {}, | 75 | {}, |
76 | }; | 76 | }; |
diff --git a/drivers/power/reset/st-poweroff.c b/drivers/power/reset/st-poweroff.c index 27383de9caa8..a488877a3538 100644 --- a/drivers/power/reset/st-poweroff.c +++ b/drivers/power/reset/st-poweroff.c | |||
@@ -97,7 +97,7 @@ static struct notifier_block st_restart_nb = { | |||
97 | .priority = 192, | 97 | .priority = 192, |
98 | }; | 98 | }; |
99 | 99 | ||
100 | static struct of_device_id st_reset_of_match[] = { | 100 | static const struct of_device_id st_reset_of_match[] = { |
101 | { | 101 | { |
102 | .compatible = "st,stih415-restart", | 102 | .compatible = "st,stih415-restart", |
103 | .data = (void *)&stih415_reset, | 103 | .data = (void *)&stih415_reset, |
diff --git a/drivers/power/reset/syscon-reboot.c b/drivers/power/reset/syscon-reboot.c index c4049f45663f..d3c7d245ae63 100644 --- a/drivers/power/reset/syscon-reboot.c +++ b/drivers/power/reset/syscon-reboot.c | |||
@@ -76,7 +76,7 @@ static int syscon_reboot_probe(struct platform_device *pdev) | |||
76 | return err; | 76 | return err; |
77 | } | 77 | } |
78 | 78 | ||
79 | static struct of_device_id syscon_reboot_of_match[] = { | 79 | static const struct of_device_id syscon_reboot_of_match[] = { |
80 | { .compatible = "syscon-reboot" }, | 80 | { .compatible = "syscon-reboot" }, |
81 | {} | 81 | {} |
82 | }; | 82 | }; |
diff --git a/drivers/power/reset/vexpress-poweroff.c b/drivers/power/reset/vexpress-poweroff.c index be12d9b92957..6a9bf7089373 100644 --- a/drivers/power/reset/vexpress-poweroff.c +++ b/drivers/power/reset/vexpress-poweroff.c | |||
@@ -80,7 +80,7 @@ DEVICE_ATTR(active, S_IRUGO | S_IWUSR, vexpress_reset_active_show, | |||
80 | 80 | ||
81 | enum vexpress_reset_func { FUNC_RESET, FUNC_SHUTDOWN, FUNC_REBOOT }; | 81 | enum vexpress_reset_func { FUNC_RESET, FUNC_SHUTDOWN, FUNC_REBOOT }; |
82 | 82 | ||
83 | static struct of_device_id vexpress_reset_of_match[] = { | 83 | static const struct of_device_id vexpress_reset_of_match[] = { |
84 | { | 84 | { |
85 | .compatible = "arm,vexpress-reset", | 85 | .compatible = "arm,vexpress-reset", |
86 | .data = (void *)FUNC_RESET, | 86 | .data = (void *)FUNC_RESET, |
diff --git a/drivers/power/reset/xgene-reboot.c b/drivers/power/reset/xgene-reboot.c index b0e5002f8deb..f07e93c97ba3 100644 --- a/drivers/power/reset/xgene-reboot.c +++ b/drivers/power/reset/xgene-reboot.c | |||
@@ -87,7 +87,7 @@ static int xgene_reboot_probe(struct platform_device *pdev) | |||
87 | return err; | 87 | return err; |
88 | } | 88 | } |
89 | 89 | ||
90 | static struct of_device_id xgene_reboot_of_match[] = { | 90 | static const struct of_device_id xgene_reboot_of_match[] = { |
91 | { .compatible = "apm,xgene-reboot" }, | 91 | { .compatible = "apm,xgene-reboot" }, |
92 | {} | 92 | {} |
93 | }; | 93 | }; |
diff --git a/drivers/power/tps65090-charger.c b/drivers/power/tps65090-charger.c index dcf9a3ca53d5..7e8fbd29c30e 100644 --- a/drivers/power/tps65090-charger.c +++ b/drivers/power/tps65090-charger.c | |||
@@ -349,7 +349,7 @@ static int tps65090_charger_remove(struct platform_device *pdev) | |||
349 | return 0; | 349 | return 0; |
350 | } | 350 | } |
351 | 351 | ||
352 | static struct of_device_id of_tps65090_charger_match[] = { | 352 | static const struct of_device_id of_tps65090_charger_match[] = { |
353 | { .compatible = "ti,tps65090-charger", }, | 353 | { .compatible = "ti,tps65090-charger", }, |
354 | { /* end */ } | 354 | { /* end */ } |
355 | }; | 355 | }; |