Commit d57b7979 authored by Bartosz Golaszewski's avatar Bartosz Golaszewski Committed by Linus Walleij
Browse files

pinctrl: make struct pinfunction a pointer in struct function_desc 



We currently duplicate the entire struct pinfunction object in
pinmux_generic_add_pinfunction(). While this is inevitable when the
arguments come in split through pinmux_generic_add_function(), users of
pinmux_generic_add_pinfunction() will typically pass addresses of
structures in .rodata, meaning we can try to avoid the duplication with
the help from kmemdup_const(). To that end: don't wrap the entire struct
pinfunction in struct function_desc but rather just store the address.

Tested-by: default avatarNeil Armstrong <neil.armstrong@linaro.org>
Signed-off-by: default avatarBartosz Golaszewski <bartosz.golaszewski@linaro.org>
Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
parent fbba4a9e

drivers/pinctrl/freescale/pinctrl-imx.c

+1 −1
Original line number Diff line number Diff line
@@ -266,7 +266,7 @@ static int imx_pmx_set(struct pinctrl_dev *pctldev, unsigned selector, 
	npins = grp->grp.npins;



	dev_dbg(ipctl->dev, "enable function %s group %s\n",

		func->func.name, grp->grp.name);

		func->func->name, grp->grp.name);



	for (i = 0; i < npins; i++) {

		/*

drivers/pinctrl/mediatek/pinctrl-airoha.c

+1 −1
Original line number Diff line number Diff line
@@ -2456,7 +2456,7 @@ static int airoha_pinmux_set_mux(struct pinctrl_dev *pctrl_dev, 
		return -EINVAL;



	dev_dbg(pctrl_dev->dev, "enable function %s group %s\n",

		desc->func.name, grp->grp.name);

		desc->func->name, grp->grp.name);



	func = desc->data;

	for (i = 0; i < func->group_size; i++) {

drivers/pinctrl/mediatek/pinctrl-moore.c

+1 −1
Original line number Diff line number Diff line
@@ -56,7 +56,7 @@ static int mtk_pinmux_set_mux(struct pinctrl_dev *pctldev, 
		return -EINVAL;



	dev_dbg(pctldev->dev, "enable function %s group %s\n",

		func->func.name, grp->grp.name);

		func->func->name, grp->grp.name);



	for (i = 0; i < grp->grp.npins; i++) {

		const struct mtk_pin_desc *desc;

drivers/pinctrl/pinctrl-ingenic.c

+1 −1
Original line number Diff line number Diff line
@@ -4015,7 +4015,7 @@ static int ingenic_pinmux_set_mux(struct pinctrl_dev *pctldev, 
		return -EINVAL;



	dev_dbg(pctldev->dev, "enable function %s group %s\n",

		func->func.name, grp->grp.name);

		func->func->name, grp->grp.name);



	mode = (uintptr_t)grp->data;

	if (mode <= 3) {

drivers/pinctrl/pinmux.c

+14 −4
Original line number Diff line number Diff line
@@ -810,7 +810,7 @@ pinmux_generic_get_function_name(struct pinctrl_dev *pctldev, 
	if (!function)

		return NULL;



	return function->func.name;

	return function->func->name;

}

EXPORT_SYMBOL_GPL(pinmux_generic_get_function_name);
@@ -835,8 +835,8 @@ int pinmux_generic_get_function_groups(struct pinctrl_dev *pctldev, 
			__func__, selector);

		return -EINVAL;

	}

	*groups = function->func.groups;

	*ngroups = function->func.ngroups;

	*groups = function->func->groups;

	*ngroups = function->func->ngroups;



	return 0;

}
@@ -903,7 +903,17 @@ int pinmux_generic_add_pinfunction(struct pinctrl_dev *pctldev, 
	if (!function)

		return -ENOMEM;



	function->func = *func;

	/*

	 * FIXME: It's generally a bad idea to use devres in subsystem core

	 * code - managed interfaces are aimed at drivers - but pinctrl already

	 * uses it all over the place so it's a larger piece of technical debt

	 * to fix.

	 */

	function->func = devm_kmemdup_const(pctldev->dev, func,

					    sizeof(*func), GFP_KERNEL);

	if (!function->func)

		return -ENOMEM;



	function->data = data;



	error = radix_tree_insert(&pctldev->pin_function_tree, selector, function);