aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/pinctrl/core.c
diff options
context:
space:
mode:
authorLinus Walleij <linus.walleij@linaro.org>2012-02-09 01:23:28 -0500
committerLinus Walleij <linus.walleij@linaro.org>2012-02-10 15:33:02 -0500
commite93bcee00c43e2bd4037291262111016f4c05793 (patch)
treee69b5f7ffffb36096949eabdc0526173b25f695d /drivers/pinctrl/core.c
parent28a8d14cc74a0180323d9150c3d3dbf9dd60d55a (diff)
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.c')
-rw-r--r--drivers/pinctrl/core.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/pinctrl/core.c b/drivers/pinctrl/core.c
index 4f10476cc1f2..75c6a6bb6c0a 100644
--- a/drivers/pinctrl/core.c
+++ b/drivers/pinctrl/core.c
@@ -624,7 +624,7 @@ struct pinctrl_dev *pinctrl_register(struct pinctrl_desc *pctldesc,
624 mutex_lock(&pinctrldev_list_mutex); 624 mutex_lock(&pinctrldev_list_mutex);
625 list_add(&pctldev->node, &pinctrldev_list); 625 list_add(&pctldev->node, &pinctrldev_list);
626 mutex_unlock(&pinctrldev_list_mutex); 626 mutex_unlock(&pinctrldev_list_mutex);
627 pinmux_hog_maps(pctldev); 627 pinctrl_hog_maps(pctldev);
628 return pctldev; 628 return pctldev;
629 629
630out_err: 630out_err:
@@ -645,7 +645,7 @@ void pinctrl_unregister(struct pinctrl_dev *pctldev)
645 return; 645 return;
646 646
647 pinctrl_remove_device_debugfs(pctldev); 647 pinctrl_remove_device_debugfs(pctldev);
648 pinmux_unhog_maps(pctldev); 648 pinctrl_unhog_maps(pctldev);
649 /* TODO: check that no pinmuxes are still active? */ 649 /* TODO: check that no pinmuxes are still active? */
650 mutex_lock(&pinctrldev_list_mutex); 650 mutex_lock(&pinctrldev_list_mutex);
651 list_del(&pctldev->node); 651 list_del(&pctldev->node);