summaryrefslogtreecommitdiff
path: root/drivers/pinctrl/core.h
diff options
context:
space:
mode:
authorLinus Walleij <linus.walleij@linaro.org>2012-02-09 07:23:28 +0100
committerLinus Walleij <linus.walleij@linaro.org>2012-02-10 21:33:02 +0100
commite93bcee00c43e2bd4037291262111016f4c05793 (patch)
treee69b5f7ffffb36096949eabdc0526173b25f695d /drivers/pinctrl/core.h
parent28a8d14cc74a0180323d9150c3d3dbf9dd60d55a (diff)
downloadlwn-e93bcee00c43e2bd4037291262111016f4c05793.tar.gz
lwn-e93bcee00c43e2bd4037291262111016f4c05793.zip
pinctrl: move generic functions to the pinctrl_ namespace
Since we want to use the former pinmux handles and mapping tables for generic control involving both muxing and configuration we begin refactoring by renaming them from pinmux_* to pinctrl_*. ChangeLog v1->v2: - Also rename the PINMUX_* macros in machine.h to PIN_ as indicated in the documentation so as to reflect the generic nature of these mapping entries from now on. Acked-by: Stephen Warren <swarren@nvidia.com> Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Diffstat (limited to 'drivers/pinctrl/core.h')
-rw-r--r--drivers/pinctrl/core.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/pinctrl/core.h b/drivers/pinctrl/core.h
index 8a8b02e9c18e..7a89888fce94 100644
--- a/drivers/pinctrl/core.h
+++ b/drivers/pinctrl/core.h
@@ -28,8 +28,8 @@ struct pinctrl_gpio_range;
* @owner: module providing the pin controller, used for refcounting
* @driver_data: driver data for drivers registering to the pin controller
* subsystem
- * @pinmux_hogs_lock: lock for the pinmux hog list
- * @pinmux_hogs: list of pinmux maps hogged by this device
+ * @pinctrl_hogs_lock: lock for the pin control hog list
+ * @pinctrl_hogs: list of pin control maps hogged by this device
*/
struct pinctrl_dev {
struct list_head node;
@@ -45,8 +45,8 @@ struct pinctrl_dev {
struct dentry *device_root;
#endif
#ifdef CONFIG_PINMUX
- struct mutex pinmux_hogs_lock;
- struct list_head pinmux_hogs;
+ struct mutex pinctrl_hogs_lock;
+ struct list_head pinctrl_hogs;
#endif
};