pinctrl: uniphier: allocate struct pinctrl_desc in probe function

[mirror_ubuntu-zesty-kernel.git] / drivers / pinctrl / uniphier / pinctrl-uniphier-ld6b.c

diff --git a/drivers/pinctrl/uniphier/pinctrl-uniphier-ld6b.c b/drivers/pinctrl/uniphier/pinctrl-uniphier-ld6b.c
index 458c8a4e1bb6b33f495b6d716d65d4189be37834..b8d1df9df1572b871ae14729830b67841448797d 100644 (file)
--- a/drivers/pinctrl/uniphier/pinctrl-uniphier-ld6b.c
+++ b/drivers/pinctrl/uniphier/pinctrl-uniphier-ld6b.c
@@ -1234,6 +1234,8 @@ static const struct uniphier_pinmux_function uniphier_ld6b_functions[] = {
 };
 
 static struct uniphier_pinctrl_socdata uniphier_ld6b_pindata = {
+       .pins = uniphier_ld6b_pins,
+       .npins = ARRAY_SIZE(uniphier_ld6b_pins),
        .groups = uniphier_ld6b_groups,
        .groups_count = ARRAY_SIZE(uniphier_ld6b_groups),
        .functions = uniphier_ld6b_functions,
@@ -1243,15 +1245,9 @@ static struct uniphier_pinctrl_socdata uniphier_ld6b_pindata = {
        .load_pinctrl = false,
 };
 
-static struct pinctrl_desc uniphier_ld6b_pinctrl_desc = {
-       .pins = uniphier_ld6b_pins,
-       .npins = ARRAY_SIZE(uniphier_ld6b_pins),
-};
-
 static int uniphier_ld6b_pinctrl_probe(struct platform_device *pdev)
 {
-       return uniphier_pinctrl_probe(pdev, &uniphier_ld6b_pinctrl_desc,
-                                     &uniphier_ld6b_pindata);
+       return uniphier_pinctrl_probe(pdev, &uniphier_ld6b_pindata);
 }
 
 static const struct of_device_id uniphier_ld6b_pinctrl_match[] = {