Code Review
/
kvmfornfv.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
These changes are the raw update to linux-4.4.6-rt14. Kernel sources
[kvmfornfv.git]
/
kernel
/
drivers
/
pinctrl
/
qcom
/
pinctrl-spmi-gpio.c
diff --git
a/kernel/drivers/pinctrl/qcom/pinctrl-spmi-gpio.c
b/kernel/drivers/pinctrl/qcom/pinctrl-spmi-gpio.c
index
ae4115e
..
6c42ca1
100644
(file)
--- a/
kernel/drivers/pinctrl/qcom/pinctrl-spmi-gpio.c
+++ b/
kernel/drivers/pinctrl/qcom/pinctrl-spmi-gpio.c
@@
-546,16
+546,6
@@
static void pmic_gpio_set(struct gpio_chip *chip, unsigned pin, int value)
pmic_gpio_config_set(state->ctrl, pin, &config, 1);
}
pmic_gpio_config_set(state->ctrl, pin, &config, 1);
}
-static int pmic_gpio_request(struct gpio_chip *chip, unsigned base)
-{
- return pinctrl_request_gpio(chip->base + base);
-}
-
-static void pmic_gpio_free(struct gpio_chip *chip, unsigned base)
-{
- pinctrl_free_gpio(chip->base + base);
-}
-
static int pmic_gpio_of_xlate(struct gpio_chip *chip,
const struct of_phandle_args *gpio_desc,
u32 *flags)
static int pmic_gpio_of_xlate(struct gpio_chip *chip,
const struct of_phandle_args *gpio_desc,
u32 *flags)
@@
-595,8
+585,8
@@
static const struct gpio_chip pmic_gpio_gpio_template = {
.direction_output = pmic_gpio_direction_output,
.get = pmic_gpio_get,
.set = pmic_gpio_set,
.direction_output = pmic_gpio_direction_output,
.get = pmic_gpio_get,
.set = pmic_gpio_set,
- .request =
pmic_gpio
_request,
- .free =
pmic_gpio
_free,
+ .request =
gpiochip_generic
_request,
+ .free =
gpiochip_generic
_free,
.of_xlate = pmic_gpio_of_xlate,
.to_irq = pmic_gpio_to_irq,
.dbg_show = pmic_gpio_dbg_show,
.of_xlate = pmic_gpio_of_xlate,
.to_irq = pmic_gpio_to_irq,
.dbg_show = pmic_gpio_dbg_show,
@@
-778,8
+768,8
@@
static int pmic_gpio_probe(struct platform_device *pdev)
state->chip.can_sleep = false;
state->ctrl = pinctrl_register(pctrldesc, dev, state);
state->chip.can_sleep = false;
state->ctrl = pinctrl_register(pctrldesc, dev, state);
- if (
!state->ctrl
)
- return
-ENODEV
;
+ if (
IS_ERR(state->ctrl)
)
+ return
PTR_ERR(state->ctrl)
;
ret = gpiochip_add(&state->chip);
if (ret) {
ret = gpiochip_add(&state->chip);
if (ret) {