aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJulia Lawall <Julia.Lawall@lip6.fr>2018-01-02 08:27:57 -0500
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2018-01-05 07:36:33 -0500
commit5a2772a82034722b4d4c7a2d4bfd07939ee46926 (patch)
tree186128b1ab28577c4528aad592693e815cb94b08
parent30a7acd573899fd8b8ac39236eff6468b195ac7d (diff)
PM / AVS: rockchip-io: account for const type of of_device_id.data
This driver creates a number of const structures that it stores in the data field of an of_device_id array. The data field of an of_device_id structure has type const void *, so there is no need for a const-discarding cast when putting const values into such a structure. Furthermore, adding const to the declaration of the location that receives a const value from such a field ensures that the compiler will continue to check that the value is not modified. The const-discarding cast on the extraction from the data field is thus no longer needed. Done using Coccinelle. Signed-off-by: Julia Lawall <Julia.Lawall@lip6.fr> Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
-rw-r--r--drivers/power/avs/rockchip-io-domain.c24
1 files changed, 12 insertions, 12 deletions
diff --git a/drivers/power/avs/rockchip-io-domain.c b/drivers/power/avs/rockchip-io-domain.c
index 75f63e38a8d1..ed2b109ae8fc 100644
--- a/drivers/power/avs/rockchip-io-domain.c
+++ b/drivers/power/avs/rockchip-io-domain.c
@@ -76,7 +76,7 @@ struct rockchip_iodomain_supply {
76struct rockchip_iodomain { 76struct rockchip_iodomain {
77 struct device *dev; 77 struct device *dev;
78 struct regmap *grf; 78 struct regmap *grf;
79 struct rockchip_iodomain_soc_data *soc_data; 79 const struct rockchip_iodomain_soc_data *soc_data;
80 struct rockchip_iodomain_supply supplies[MAX_SUPPLIES]; 80 struct rockchip_iodomain_supply supplies[MAX_SUPPLIES];
81}; 81};
82 82
@@ -382,43 +382,43 @@ static const struct rockchip_iodomain_soc_data soc_data_rv1108_pmu = {
382static const struct of_device_id rockchip_iodomain_match[] = { 382static const struct of_device_id rockchip_iodomain_match[] = {
383 { 383 {
384 .compatible = "rockchip,rk3188-io-voltage-domain", 384 .compatible = "rockchip,rk3188-io-voltage-domain",
385 .data = (void *)&soc_data_rk3188 385 .data = &soc_data_rk3188
386 }, 386 },
387 { 387 {
388 .compatible = "rockchip,rk3228-io-voltage-domain", 388 .compatible = "rockchip,rk3228-io-voltage-domain",
389 .data = (void *)&soc_data_rk3228 389 .data = &soc_data_rk3228
390 }, 390 },
391 { 391 {
392 .compatible = "rockchip,rk3288-io-voltage-domain", 392 .compatible = "rockchip,rk3288-io-voltage-domain",
393 .data = (void *)&soc_data_rk3288 393 .data = &soc_data_rk3288
394 }, 394 },
395 { 395 {
396 .compatible = "rockchip,rk3328-io-voltage-domain", 396 .compatible = "rockchip,rk3328-io-voltage-domain",
397 .data = (void *)&soc_data_rk3328 397 .data = &soc_data_rk3328
398 }, 398 },
399 { 399 {
400 .compatible = "rockchip,rk3368-io-voltage-domain", 400 .compatible = "rockchip,rk3368-io-voltage-domain",
401 .data = (void *)&soc_data_rk3368 401 .data = &soc_data_rk3368
402 }, 402 },
403 { 403 {
404 .compatible = "rockchip,rk3368-pmu-io-voltage-domain", 404 .compatible = "rockchip,rk3368-pmu-io-voltage-domain",
405 .data = (void *)&soc_data_rk3368_pmu 405 .data = &soc_data_rk3368_pmu
406 }, 406 },
407 { 407 {
408 .compatible = "rockchip,rk3399-io-voltage-domain", 408 .compatible = "rockchip,rk3399-io-voltage-domain",
409 .data = (void *)&soc_data_rk3399 409 .data = &soc_data_rk3399
410 }, 410 },
411 { 411 {
412 .compatible = "rockchip,rk3399-pmu-io-voltage-domain", 412 .compatible = "rockchip,rk3399-pmu-io-voltage-domain",
413 .data = (void *)&soc_data_rk3399_pmu 413 .data = &soc_data_rk3399_pmu
414 }, 414 },
415 { 415 {
416 .compatible = "rockchip,rv1108-io-voltage-domain", 416 .compatible = "rockchip,rv1108-io-voltage-domain",
417 .data = (void *)&soc_data_rv1108 417 .data = &soc_data_rv1108
418 }, 418 },
419 { 419 {
420 .compatible = "rockchip,rv1108-pmu-io-voltage-domain", 420 .compatible = "rockchip,rv1108-pmu-io-voltage-domain",
421 .data = (void *)&soc_data_rv1108_pmu 421 .data = &soc_data_rv1108_pmu
422 }, 422 },
423 { /* sentinel */ }, 423 { /* sentinel */ },
424}; 424};
@@ -443,7 +443,7 @@ static int rockchip_iodomain_probe(struct platform_device *pdev)
443 platform_set_drvdata(pdev, iod); 443 platform_set_drvdata(pdev, iod);
444 444
445 match = of_match_node(rockchip_iodomain_match, np); 445 match = of_match_node(rockchip_iodomain_match, np);
446 iod->soc_data = (struct rockchip_iodomain_soc_data *)match->data; 446 iod->soc_data = match->data;
447 447
448 parent = pdev->dev.parent; 448 parent = pdev->dev.parent;
449 if (parent && parent->of_node) { 449 if (parent && parent->of_node) {