Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 59837002 authored by Andy Shevchenko's avatar Andy Shevchenko Committed by Linus Walleij
Browse files

pinctrl: armada-37xx: Convert to use match_string() helper 



The new helper returns index of the matching string in an array.
We are going to use it here.

Signed-off-by: default avatarAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
parent 90b60552

drivers/pinctrl/mvebu/pinctrl-armada-37xx.c

+8 −21
Original line number Diff line number Diff line
@@ -214,18 +214,6 @@ static inline void armada_37xx_update_reg(unsigned int *reg, 
	}

}



static int armada_37xx_get_func_reg(struct armada_37xx_pin_group *grp,

				    const char *func)

{

	int f;



	for (f = 0; (f < NB_FUNCS) && grp->funcs[f]; f++)

		if (!strcmp(grp->funcs[f], func))

			return f;



	return -ENOTSUPP;

}



static struct armada_37xx_pin_group *armada_37xx_find_next_grp_by_pin(

	struct armada_37xx_pinctrl *info, int pin, int *grp)

{
@@ -344,10 +332,9 @@ static int armada_37xx_pmx_set_by_name(struct pinctrl_dev *pctldev, 
	dev_dbg(info->dev, "enable function %s group %s\n",

		name, grp->name);



	func = armada_37xx_get_func_reg(grp, name);



	func = match_string(grp->funcs, NB_FUNCS, name);

	if (func < 0)

		return func;

		return -ENOTSUPP;



	val = grp->val[func];
@@ -932,14 +919,14 @@ static int armada_37xx_fill_func(struct armada_37xx_pinctrl *info) 
			struct armada_37xx_pin_group *gp = &info->groups[g];

			int f;



			for (f = 0; (f < NB_FUNCS) && gp->funcs[f]; f++) {

				if (strcmp(gp->funcs[f], name) == 0) {

			f = match_string(gp->funcs, NB_FUNCS, name);

			if (f < 0)

				continue;



			*groups = gp->name;

			groups++;

		}

	}

		}

	}

	return 0;

}