Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 287068
b: refs/heads/master
c: de849ee
h: refs/heads/master
v: v3
  • Loading branch information
Tony Lindgren authored and Linus Walleij committed Jan 26, 2012
1 parent c84a775 commit cb1117d
Show file tree
Hide file tree
Showing 3 changed files with 4 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: 0215716083cac67ff7ea3e3efdc9943bdb462274
refs/heads/master: de849eecd0addaa6bf60f2f7be36b30abf9ff2ae
2 changes: 1 addition & 1 deletion trunk/Documentation/pinctrl.txt
Original file line number Diff line number Diff line change
Expand Up @@ -1024,7 +1024,7 @@ it, disables and releases it, and muxes it in on the pins defined by group B:

foo_switch()
{
struct pinmux pmx;
struct pinmux *pmx;

/* Enable on position A */
pmx = pinmux_get(&device, "spi0-pos-A");
Expand Down
9 changes: 2 additions & 7 deletions trunk/drivers/pinctrl/pinmux.c
Original file line number Diff line number Diff line change
Expand Up @@ -53,11 +53,6 @@ struct pinmux_group {
* @dev: the device using this pinmux
* @usecount: the number of active users of this mux setting, used to keep
* track of nested use cases
* @pins: an array of discrete physical pins used in this mapping, taken
* from the global pin enumeration space (copied from pinmux map)
* @num_pins: the number of pins in this mapping array, i.e. the number of
* elements in .pins so we can iterate over that array (copied from
* pinmux map)
* @pctldev: pin control device handling this pinmux
* @func_selector: the function selector for the pinmux device handling
* this pinmux
Expand Down Expand Up @@ -409,7 +404,7 @@ int __init pinmux_register_mappings(struct pinmux_map const *maps,
}

/**
* acquire_pins() - acquire all the pins for a certain funcion on a pinmux
* acquire_pins() - acquire all the pins for a certain function on a pinmux
* @pctldev: the device to take the pins on
* @func_selector: the function selector to acquire the pins for
* @group_selector: the group selector containing the pins to acquire
Expand Down Expand Up @@ -455,7 +450,7 @@ static int acquire_pins(struct pinctrl_dev *pctldev,

/**
* release_pins() - release pins taken by earlier acquirement
* @pctldev: the device to free the pinx on
* @pctldev: the device to free the pins on
* @group_selector: the group selector containing the pins to free
*/
static void release_pins(struct pinctrl_dev *pctldev,
Expand Down

0 comments on commit cb1117d

Please sign in to comment.