diff options
author | Stephen Warren <swarren@nvidia.com> | 2012-02-19 23:45:45 -0700 |
---|---|---|
committer | Linus Walleij <linus.walleij@linaro.org> | 2012-02-22 17:59:32 +0100 |
commit | 03665e0f248d6b7542f72cd7c4ec521109f283c7 (patch) | |
tree | 72761b986a95728508f9d9871f30059ba3a409bc /drivers/pinctrl/pinmux.c | |
parent | b2b3e66e40bb60b1aa222d2f712c019653215390 (diff) | |
download | linux-03665e0f248d6b7542f72cd7c4ec521109f283c7.tar.bz2 |
pinctrl: Re-order pinmux.[ch] to match each-other
Modify the two files so that the order of function prototypes in the
header matches the order of implementations in the .c file.
Signed-off-by: Stephen Warren <swarren@nvidia.com>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Diffstat (limited to 'drivers/pinctrl/pinmux.c')
-rw-r--r-- | drivers/pinctrl/pinmux.c | 56 |
1 files changed, 28 insertions, 28 deletions
diff --git a/drivers/pinctrl/pinmux.c b/drivers/pinctrl/pinmux.c index 5a09cd202208..ea31c4655667 100644 --- a/drivers/pinctrl/pinmux.c +++ b/drivers/pinctrl/pinmux.c @@ -40,6 +40,34 @@ struct pinmux_group { unsigned group_selector; }; +int pinmux_check_ops(struct pinctrl_dev *pctldev) +{ + const struct pinmux_ops *ops = pctldev->desc->pmxops; + unsigned selector = 0; + + /* Check that we implement required operations */ + if (!ops->list_functions || + !ops->get_function_name || + !ops->get_function_groups || + !ops->enable || + !ops->disable) + return -EINVAL; + + /* Check that all functions registered have names */ + while (ops->list_functions(pctldev, selector) >= 0) { + const char *fname = ops->get_function_name(pctldev, + selector); + if (!fname) { + pr_err("pinmux ops has no name for function%u\n", + selector); + return -EINVAL; + } + selector++; + } + + return 0; +} + /** * pin_request() - request a single pin to be muxed in, typically for GPIO * @pin: the pin number in the global pin space @@ -561,34 +589,6 @@ void pinmux_disable(struct pinctrl *p) } } -int pinmux_check_ops(struct pinctrl_dev *pctldev) -{ - const struct pinmux_ops *ops = pctldev->desc->pmxops; - unsigned selector = 0; - - /* Check that we implement required operations */ - if (!ops->list_functions || - !ops->get_function_name || - !ops->get_function_groups || - !ops->enable || - !ops->disable) - return -EINVAL; - - /* Check that all functions registered have names */ - while (ops->list_functions(pctldev, selector) >= 0) { - const char *fname = ops->get_function_name(pctldev, - selector); - if (!fname) { - pr_err("pinmux ops has no name for function%u\n", - selector); - return -EINVAL; - } - selector++; - } - - return 0; -} - #ifdef CONFIG_DEBUG_FS /* Called from pincontrol core */ |