diff options
author | Linus Walleij <linus.walleij@linaro.org> | 2017-01-26 15:27:54 +0100 |
---|---|---|
committer | Linus Walleij <linus.walleij@linaro.org> | 2017-01-26 15:27:54 +0100 |
commit | 27a2873617415f7a5b9881a532008efd92334b05 (patch) | |
tree | 55e1d83ab16e2cfff45fe09cc12e1cd21cd78fda /drivers/pinctrl/meson | |
parent | af81ba3cfdeefcb743e3f82cdbdbac8294ae6779 (diff) | |
parent | 2956b5d94a76b596fa5057c2b3ca915cb27d7652 (diff) | |
download | linux-stable-27a2873617415f7a5b9881a532008efd92334b05.tar.gz linux-stable-27a2873617415f7a5b9881a532008efd92334b05.tar.bz2 linux-stable-27a2873617415f7a5b9881a532008efd92334b05.zip |
Merge branch 'ib-pinctrl-genprops' into devel
Diffstat (limited to 'drivers/pinctrl/meson')
-rw-r--r-- | drivers/pinctrl/meson/pinctrl-meson.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/pinctrl/meson/pinctrl-meson.c b/drivers/pinctrl/meson/pinctrl-meson.c index a579126832af..8fbb571f50de 100644 --- a/drivers/pinctrl/meson/pinctrl-meson.c +++ b/drivers/pinctrl/meson/pinctrl-meson.c @@ -260,7 +260,6 @@ static int meson_pinconf_set(struct pinctrl_dev *pcdev, unsigned int pin, enum pin_config_param param; unsigned int reg, bit; int i, ret; - u16 arg; ret = meson_get_bank(pc, pin, &bank); if (ret) @@ -268,7 +267,6 @@ static int meson_pinconf_set(struct pinctrl_dev *pcdev, unsigned int pin, 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: |