Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 349337
b: refs/heads/master
c: 4b090d8
h: refs/heads/master
i:
  349335: 3e2588b
v: v3
  • Loading branch information
Fabio Estevam authored and Linus Walleij committed Jan 18, 2013
1 parent 1aa555e commit e2826ac
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 6 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: f9925b5f681d16a831210f00daedf8e9105073f4
refs/heads/master: 4b090d8dffd2a036f894c3fa6da3c5cc0e20536c
9 changes: 4 additions & 5 deletions trunk/drivers/pinctrl/pinctrl-mxs.c
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,7 @@ static int mxs_dt_node_to_map(struct pinctrl_dev *pctldev,
static void mxs_dt_free_map(struct pinctrl_dev *pctldev,
struct pinctrl_map *map, unsigned num_maps)
{
int i;
u32 i;

for (i = 0; i < num_maps; i++) {
if (map[i].type == PIN_MAP_TYPE_MUX_GROUP)
Expand Down Expand Up @@ -203,7 +203,7 @@ static int mxs_pinctrl_enable(struct pinctrl_dev *pctldev, unsigned selector,
void __iomem *reg;
u8 bank, shift;
u16 pin;
int i;
u32 i;

for (i = 0; i < g->npins; i++) {
bank = PINID_TO_BANK(g->pins[i]);
Expand Down Expand Up @@ -256,7 +256,7 @@ static int mxs_pinconf_group_set(struct pinctrl_dev *pctldev,
void __iomem *reg;
u8 ma, vol, pull, bank, shift;
u16 pin;
int i;
u32 i;

ma = CONFIG_TO_MA(config);
vol = CONFIG_TO_VOL(config);
Expand Down Expand Up @@ -345,8 +345,7 @@ static int mxs_pinctrl_parse_group(struct platform_device *pdev,
const char *propname = "fsl,pinmux-ids";
char *group;
int length = strlen(np->name) + SUFFIX_LEN;
int i;
u32 val;
u32 val, i;

group = devm_kzalloc(&pdev->dev, length, GFP_KERNEL);
if (!group)
Expand Down

0 comments on commit e2826ac

Please sign in to comment.