Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 355344
b: refs/heads/master
c: 4a2e0d1
h: refs/heads/master
v: v3
  • Loading branch information
Laurent Pinchart authored and Simon Horman committed Jan 25, 2013
1 parent 1499747 commit 9d6cb1c
Show file tree
Hide file tree
Showing 2 changed files with 4 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: c9fa88e23a8c6d1a72ba37c7d4df3d05051e8e8e
refs/heads/master: 4a2e0d18f95e1ec2b264f66e7cedec7f3dc54b44
8 changes: 3 additions & 5 deletions trunk/drivers/sh/pfc/pinctrl.c
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@ static void sh_pfc_noop_disable(struct pinctrl_dev *pctldev, unsigned func,
{
}

static inline int sh_pfc_config_function(struct sh_pfc *pfc, unsigned offset)
static int sh_pfc_config_function(struct sh_pfc *pfc, unsigned offset)
{
if (sh_pfc_config_gpio(pfc, offset,
PINMUX_TYPE_FUNCTION,
Expand Down Expand Up @@ -328,10 +328,8 @@ static struct pinctrl_desc sh_pfc_pinctrl_desc = {
.confops = &sh_pfc_pinconf_ops,
};

static inline void sh_pfc_map_one_gpio(struct sh_pfc *pfc,
struct sh_pfc_pinctrl *pmx,
struct pinmux_gpio *gpio,
unsigned offset)
static void sh_pfc_map_one_gpio(struct sh_pfc *pfc, struct sh_pfc_pinctrl *pmx,
struct pinmux_gpio *gpio, unsigned offset)
{
struct pinmux_data_reg *dummy;
unsigned long flags;
Expand Down

0 comments on commit 9d6cb1c

Please sign in to comment.