xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge tag 'v4.5-rc5' into devel

Browse Source 
Linux 4.5-rc5
This commit is contained in:
Linus Walleij
2016-03-10 09:29:25 +07:00
parent d2d13ed013 81f70ba233
commit cc998d8bc7
1183 changed files with 12744 additions and 59582 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
drivers/pinctrl/nomadik/pinctrl-abx500.c
View File

@@ -191,6 +191,7 @@ static void abx500_gpio_set(struct gpio_chip *chip, unsigned offset, int val)
dev_err(pct->dev, "%s write failed (%d)\n", __func__, ret);
}
#ifdef CONFIG_DEBUG_FS
static int abx500_get_pull_updown(struct abx500_pinctrl *pct, int offset,
enum abx500_gpio_pull_updown *pull_updown)
{
@@ -226,6 +227,7 @@ out:
return ret;
}
#endif
static int abx500_set_pull_updown(struct abx500_pinctrl *pct,
int offset, enum abx500_gpio_pull_updown val)
@@ -468,6 +470,7 @@ out:
return ret;
}
#ifdef CONFIG_DEBUG_FS
static int abx500_get_mode(struct pinctrl_dev *pctldev, struct gpio_chip *chip,
unsigned gpio)
{
@@ -553,8 +556,6 @@ out:
return ret;
}
#ifdef CONFIG_DEBUG_FS
#include <linux/seq_file.h>
static void abx500_gpio_dbg_show_one(struct seq_file *s,