diff options
| author | Linus Walleij <linus.walleij@linaro.org> | 2017-01-26 17:27:54 +0300 |
|---|---|---|
| committer | Linus Walleij <linus.walleij@linaro.org> | 2017-01-26 17:27:54 +0300 |
| commit | 27a2873617415f7a5b9881a532008efd92334b05 (patch) | |
| tree | 55e1d83ab16e2cfff45fe09cc12e1cd21cd78fda /drivers/pinctrl/pinctrl-da850-pupd.c | |
| parent | af81ba3cfdeefcb743e3f82cdbdbac8294ae6779 (diff) | |
| parent | 2956b5d94a76b596fa5057c2b3ca915cb27d7652 (diff) | |
| download | linux-27a2873617415f7a5b9881a532008efd92334b05.tar.xz | |
Merge branch 'ib-pinctrl-genprops' into devel
Diffstat (limited to 'drivers/pinctrl/pinctrl-da850-pupd.c')
| -rw-r--r-- | drivers/pinctrl/pinctrl-da850-pupd.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/pinctrl/pinctrl-da850-pupd.c b/drivers/pinctrl/pinctrl-da850-pupd.c index 921729b4bb46..f41d3d948dd8 100644 --- a/drivers/pinctrl/pinctrl-da850-pupd.c +++ b/drivers/pinctrl/pinctrl-da850-pupd.c @@ -113,7 +113,6 @@ static int da850_pupd_pin_config_group_set(struct pinctrl_dev *pctldev, struct da850_pupd_data *data = pinctrl_dev_get_drvdata(pctldev); u32 ena, sel; enum pin_config_param param; - u16 arg; int i; ena = readl(data->base + DA850_PUPD_ENA); @@ -121,7 +120,6 @@ static int da850_pupd_pin_config_group_set(struct pinctrl_dev *pctldev, for (i = 0; i < num_configs; i++) { param = pinconf_to_config_param(configs[i]); - arg = pinconf_to_config_argument(configs[i]); switch (param) { case PIN_CONFIG_BIAS_DISABLE: |