From d4e3198736d9d64e4ba4d2b46ab75cbcf5d0a4e0 Mon Sep 17 00:00:00 2001 From: Stephen Warren Date: Thu, 1 Mar 2012 18:48:31 -0700 Subject: pinctrl: enhance pinctrl_get() to handle multiple functions At present, pinctrl_get() assumes that all matching mapping table entries have the same "function" value, albeit potentially applied to different pins/groups. This change removes this restriction; pinctrl_get() can now handle a set of mapping tables where different functions are applied to the various pins/groups. Signed-off-by: Stephen Warren Signed-off-by: Linus Walleij --- drivers/pinctrl/core.h | 3 --- 1 file changed, 3 deletions(-) (limited to 'drivers/pinctrl/core.h') diff --git a/drivers/pinctrl/core.h b/drivers/pinctrl/core.h index 7551611666f8..8164e7b4182b 100644 --- a/drivers/pinctrl/core.h +++ b/drivers/pinctrl/core.h @@ -53,8 +53,6 @@ struct pinctrl_dev { * to keep track of nested use cases * @pctldev: pin control device handling this pin control handle * @mutex: a lock for the pin control state holder - * @func_selector: the function selector for the pinmux device handling - * this pinmux * @groups: the group selectors for the pinmux device and * selector combination handling this pinmux, this is a list that * will be traversed on all pinmux operations such as @@ -67,7 +65,6 @@ struct pinctrl { struct pinctrl_dev *pctldev; struct mutex mutex; #ifdef CONFIG_PINMUX - unsigned func_selector; struct list_head groups; #endif }; -- cgit v1.2.3