pinctrl: imx: Convert to use grp member

[linux-2.6-microblaze.git] / drivers / pinctrl / freescale / pinctrl-imx.c

diff --git a/drivers/pinctrl/freescale/pinctrl-imx.c b/drivers/pinctrl/freescale/pinctrl-imx.c
index 28164b0..2d3d809 100644 (file)
--- a/drivers/pinctrl/freescale/pinctrl-imx.c
+++ b/drivers/pinctrl/freescale/pinctrl-imx.c
@@ -42,7 +42,7 @@ static inline const struct group_desc *imx_pinctrl_find_group_by_name(
 
        for (i = 0; i < pctldev->num_groups; i++) {
                grp = pinctrl_generic_get_group(pctldev, i);
-               if (grp && !strcmp(grp->name, name))
+               if (grp && !strcmp(grp->grp.name, name))
                        break;
        }
 
@@ -79,9 +79,9 @@ static int imx_dt_node_to_map(struct pinctrl_dev *pctldev,
        }
 
        if (info->flags & IMX_USE_SCU) {
-               map_num += grp->num_pins;
+               map_num += grp->grp.npins;
        } else {
-               for (i = 0; i < grp->num_pins; i++) {
+               for (i = 0; i < grp->grp.npins; i++) {
                        pin = &((struct imx_pin *)(grp->data))[i];
                        if (!(pin->conf.mmio.config & IMX_NO_PAD_CTL))
                                map_num++;
@@ -109,7 +109,7 @@ static int imx_dt_node_to_map(struct pinctrl_dev *pctldev,
 
        /* create config map */
        new_map++;
-       for (i = j = 0; i < grp->num_pins; i++) {
+       for (i = j = 0; i < grp->grp.npins; i++) {
                pin = &((struct imx_pin *)(grp->data))[i];
 
                /*
@@ -263,10 +263,10 @@ static int imx_pmx_set(struct pinctrl_dev *pctldev, unsigned selector,
        if (!func)
                return -EINVAL;
 
-       npins = grp->num_pins;
+       npins = grp->grp.npins;
 
        dev_dbg(ipctl->dev, "enable function %s group %s\n",
-               func->name, grp->name);
+               func->name, grp->grp.name);
 
        for (i = 0; i < npins; i++) {
                /*
@@ -423,7 +423,7 @@ static void imx_pinconf_group_dbg_show(struct pinctrl_dev *pctldev,
        if (!grp)
                return;
 
-       for (i = 0; i < grp->num_pins; i++) {
+       for (i = 0; i < grp->grp.npins; i++) {
                struct imx_pin *pin = &((struct imx_pin *)(grp->data))[i];
 
                name = pin_get_name(pctldev, pin->pin);
@@ -526,7 +526,7 @@ static int imx_pinctrl_parse_groups(struct device_node *np,
                pin_size = FSL_PIN_SIZE;
 
        /* Initialise group */
-       grp->name = np->name;
+       grp->grp.name = np->name;
 
        /*
         * the binding format is fsl,pins = <PIN_FUNC_ID CONFIG ...>,
@@ -554,19 +554,17 @@ static int imx_pinctrl_parse_groups(struct device_node *np,
                return -EINVAL;
        }
 
-       grp->num_pins = size / pin_size;
-       grp->data = devm_kcalloc(ipctl->dev,
-                                grp->num_pins, sizeof(struct imx_pin),
-                                GFP_KERNEL);
+       grp->grp.npins = size / pin_size;
+       grp->data = devm_kcalloc(ipctl->dev, grp->grp.npins, sizeof(*pin), GFP_KERNEL);
        if (!grp->data)
                return -ENOMEM;
 
-       pins = devm_kcalloc(ipctl->dev, grp->num_pins, sizeof(*pins), GFP_KERNEL);
+       pins = devm_kcalloc(ipctl->dev, grp->grp.npins, sizeof(*pins), GFP_KERNEL);
        if (!pins)
                return -ENOMEM;
-       grp->pins = pins;
+       grp->grp.pins = pins;
 
-       for (i = 0; i < grp->num_pins; i++) {
+       for (i = 0; i < grp->grp.npins; i++) {
                pin = &((struct imx_pin *)(grp->data))[i];
                if (info->flags & IMX_USE_SCU)
                        info->imx_pinctrl_parse_pin(ipctl, &pins[i], pin, &list);
@@ -613,8 +611,7 @@ static int imx_pinctrl_parse_functions(struct device_node *np,
 
        i = 0;
        for_each_child_of_node(np, child) {
-               grp = devm_kzalloc(ipctl->dev, sizeof(struct group_desc),
-                                  GFP_KERNEL);
+               grp = devm_kzalloc(ipctl->dev, sizeof(*grp), GFP_KERNEL);
                if (!grp) {
                        of_node_put(child);
                        return -ENOMEM;