Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 294071
b: refs/heads/master
c: 4ecce45
h: refs/heads/master
i:
  294069: b9ba799
  294067: 02b3a79
  294063: 0903cb5
v: v3
  • Loading branch information
Stephen Warren authored and Linus Walleij committed Feb 22, 2012
1 parent 9fade57 commit 04ca350
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 9 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 2b694250174980382bddcb00e1de7654ecdf6f1f
refs/heads/master: 4ecce45dd663f6945bed7e2e06c05b5d90f3a2a1
12 changes: 7 additions & 5 deletions trunk/drivers/pinctrl/core.c
Original file line number Diff line number Diff line change
Expand Up @@ -293,9 +293,9 @@ pinctrl_match_gpio_range(struct pinctrl_dev *pctldev, unsigned gpio)
* the GPIO subsystem, return the device and the matching GPIO range. Returns
* negative if the GPIO range could not be found in any device.
*/
int pinctrl_get_device_gpio_range(unsigned gpio,
struct pinctrl_dev **outdev,
struct pinctrl_gpio_range **outrange)
static int pinctrl_get_device_gpio_range(unsigned gpio,
struct pinctrl_dev **outdev,
struct pinctrl_gpio_range **outrange)
{
struct pinctrl_dev *pctldev = NULL;

Expand Down Expand Up @@ -332,6 +332,7 @@ void pinctrl_add_gpio_range(struct pinctrl_dev *pctldev,
list_add_tail(&range->node, &pctldev->gpio_ranges);
mutex_unlock(&pctldev->gpio_ranges_lock);
}
EXPORT_SYMBOL_GPL(pinctrl_add_gpio_range);

/**
* pinctrl_remove_gpio_range() - remove a range of GPIOs fro a pin controller
Expand All @@ -345,6 +346,7 @@ void pinctrl_remove_gpio_range(struct pinctrl_dev *pctldev,
list_del(&range->node);
mutex_unlock(&pctldev->gpio_ranges_lock);
}
EXPORT_SYMBOL_GPL(pinctrl_remove_gpio_range);

/**
* pinctrl_get_group_selector() - returns the group selector for a group
Expand Down Expand Up @@ -785,7 +787,7 @@ static int pinctrl_hog_map(struct pinctrl_dev *pctldev,
* map entries that need to be hogged, i.e. get+enabled until the system shuts
* down.
*/
int pinctrl_hog_maps(struct pinctrl_dev *pctldev)
static int pinctrl_hog_maps(struct pinctrl_dev *pctldev)
{
struct device *dev = pctldev->dev;
const char *devname = dev_name(dev);
Expand Down Expand Up @@ -819,7 +821,7 @@ int pinctrl_hog_maps(struct pinctrl_dev *pctldev)
* pinctrl_unhog_maps() - unhog specific map entries on controller device
* @pctldev: the pin control device to unhog entries on
*/
void pinctrl_unhog_maps(struct pinctrl_dev *pctldev)
static void pinctrl_unhog_maps(struct pinctrl_dev *pctldev)
{
struct list_head *node, *tmp;

Expand Down
3 changes: 0 additions & 3 deletions trunk/drivers/pinctrl/core.h
Original file line number Diff line number Diff line change
Expand Up @@ -101,8 +101,5 @@ struct pin_desc {
struct pinctrl_dev *get_pinctrl_dev_from_devname(const char *dev_name);
struct pin_desc *pin_desc_get(struct pinctrl_dev *pctldev, unsigned int pin);
int pin_get_from_name(struct pinctrl_dev *pctldev, const char *name);
int pinctrl_get_device_gpio_range(unsigned gpio,
struct pinctrl_dev **outdev,
struct pinctrl_gpio_range **outrange);
int pinctrl_get_group_selector(struct pinctrl_dev *pctldev,
const char *pin_group);

0 comments on commit 04ca350

Please sign in to comment.