Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2b694250 authored by Stephen Warren's avatar Stephen Warren Committed by Linus Walleij
Browse files

pinctrl: Re-order pinconf.[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.

Don't prototype a couple of internal functions.

Signed-off-by: default avatarStephen Warren <swarren@nvidia.com>
Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
parent 03665e0f

drivers/pinctrl/pinconf.c

+15 −16
Original line number Diff line number Diff line
@@ -23,7 +23,20 @@ 
#include "core.h"

#include "pinconf.h"



int pin_config_get_for_pin(struct pinctrl_dev *pctldev, unsigned pin,

int pinconf_check_ops(struct pinctrl_dev *pctldev)

{

	const struct pinconf_ops *ops = pctldev->desc->confops;



	/* We must be able to read out pin status */

	if (!ops->pin_config_get && !ops->pin_config_group_get)

		return -EINVAL;

	/* We have to be able to config the pins in SOME way */

	if (!ops->pin_config_set && !ops->pin_config_group_set)

		return -EINVAL;

	return 0;

}



static int pin_config_get_for_pin(struct pinctrl_dev *pctldev, unsigned pin,

			   unsigned long *config)

{

	const struct pinconf_ops *ops = pctldev->desc->confops;
@@ -63,7 +76,7 @@ int pin_config_get(const char *dev_name, const char *name, 
}

EXPORT_SYMBOL(pin_config_get);



int pin_config_set_for_pin(struct pinctrl_dev *pctldev, unsigned pin,

static int pin_config_set_for_pin(struct pinctrl_dev *pctldev, unsigned pin,

			   unsigned long config)

{

	const struct pinconf_ops *ops = pctldev->desc->confops;
@@ -138,7 +151,6 @@ int pin_config_group_get(const char *dev_name, const char *pin_group, 
}

EXPORT_SYMBOL(pin_config_group_get);





int pin_config_group_set(const char *dev_name, const char *pin_group,

			 unsigned long config)

{
@@ -205,19 +217,6 @@ int pin_config_group_set(const char *dev_name, const char *pin_group, 
}

EXPORT_SYMBOL(pin_config_group_set);



int pinconf_check_ops(struct pinctrl_dev *pctldev)

{

	const struct pinconf_ops *ops = pctldev->desc->confops;



	/* We must be able to read out pin status */

	if (!ops->pin_config_get && !ops->pin_config_group_get)

		return -EINVAL;

	/* We have to be able to config the pins in SOME way */

	if (!ops->pin_config_set && !ops->pin_config_group_set)

		return -EINVAL;

	return 0;

}



#ifdef CONFIG_DEBUG_FS



static void pinconf_dump_pin(struct pinctrl_dev *pctldev,

drivers/pinctrl/pinconf.h

+1 −4
Original line number Diff line number Diff line
@@ -14,12 +14,9 @@ 
#ifdef CONFIG_PINCONF



int pinconf_check_ops(struct pinctrl_dev *pctldev);



void pinconf_init_device_debugfs(struct dentry *devroot,

				 struct pinctrl_dev *pctldev);

int pin_config_get_for_pin(struct pinctrl_dev *pctldev, unsigned pin,

			   unsigned long *config);

int pin_config_set_for_pin(struct pinctrl_dev *pctldev, unsigned pin,

			   unsigned long config);



#else