aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMaxime Ripard <maxime.ripard@free-electrons.com>2014-04-18 13:34:07 -0400
committerMaxime Ripard <maxime.ripard@free-electrons.com>2014-05-04 02:59:02 -0400
commitd39bd8457fc057d9bf380211215684e23ff48ddd (patch)
treea8a514934b4cc68e8c106d75cd1b55bd900dd85f
parentfd67f884782a281eb033e40b0f8eae623416035e (diff)
pinctrl: sunxi: Add const qualifier to the pin descriptor
The pins description structure were declared as const, but the of_device_id data magic was losing it silently. Make sure we have it on both sides. And now that we're using const, we can also remove the useless cast in probe. Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
-rw-r--r--drivers/pinctrl/pinctrl-sunxi.c2
-rw-r--r--drivers/pinctrl/pinctrl-sunxi.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/pinctrl/pinctrl-sunxi.c b/drivers/pinctrl/pinctrl-sunxi.c
index f086509a28d3..f41c312673f4 100644
--- a/drivers/pinctrl/pinctrl-sunxi.c
+++ b/drivers/pinctrl/pinctrl-sunxi.c
@@ -812,7 +812,7 @@ static int sunxi_pinctrl_probe(struct platform_device *pdev)
812 if (!device) 812 if (!device)
813 return -ENODEV; 813 return -ENODEV;
814 814
815 pctl->desc = (struct sunxi_pinctrl_desc *)device->data; 815 pctl->desc = device->data;
816 816
817 ret = sunxi_pinctrl_build_state(pdev); 817 ret = sunxi_pinctrl_build_state(pdev);
818 if (ret) { 818 if (ret) {
diff --git a/drivers/pinctrl/pinctrl-sunxi.h b/drivers/pinctrl/pinctrl-sunxi.h
index 35d15b229a70..90040accb11c 100644
--- a/drivers/pinctrl/pinctrl-sunxi.h
+++ b/drivers/pinctrl/pinctrl-sunxi.h
@@ -468,7 +468,7 @@ struct sunxi_pinctrl_group {
468struct sunxi_pinctrl { 468struct sunxi_pinctrl {
469 void __iomem *membase; 469 void __iomem *membase;
470 struct gpio_chip *chip; 470 struct gpio_chip *chip;
471 struct sunxi_pinctrl_desc *desc; 471 const struct sunxi_pinctrl_desc *desc;
472 struct device *dev; 472 struct device *dev;
473 struct irq_domain *domain; 473 struct irq_domain *domain;
474 struct sunxi_pinctrl_function *functions; 474 struct sunxi_pinctrl_function *functions;