hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

pinctrl: spmi-gpio: Use devm_pinctrl_register() for pinctrl registration 

Use devm_pinctrl_register() for pin control registration and clean
the error path.

Signed-off-by: Laxman Dewangan <ldewangan@nvidia.com>
Cc: "Björn Andersson" <bjorn.andersson@sonymobile.com>
Cc: "Ivan T. Ivanov" <ivan.ivanov@linaro.org>
Cc: Lee Jones <lee.jones@linaro.org>
Cc: Stephen Boyd <sboyd@codeaurora.org>
Cc: Jonas Gorski <jogo@openwrt.org>
Reviewed-by: Bjorn Andersson <bjorn.andersson@linaro.org>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
This commit is contained in:
Laxman Dewangan 2016-02-24 14:44:07 +05:30 committed by Linus Walleij
parent 0ee60110ca
commit b46ddfe60b
1 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
drivers/pinctrl/qcom/pinctrl-spmi-gpio.c
View File

@ -764,14 +764,14 @@ static int pmic_gpio_probe(struct platform_device *pdev)
state->chip.of_gpio_n_cells = 2; state->chip.of_gpio_n_cells = 2;
state->chip.can_sleep = false; state->chip.can_sleep = false;
state->ctrl = pinctrl_register(pctrldesc, dev, state); state->ctrl = devm_pinctrl_register(dev, pctrldesc, state);
if (IS_ERR(state->ctrl)) if (IS_ERR(state->ctrl))
return PTR_ERR(state->ctrl); return PTR_ERR(state->ctrl);
ret = gpiochip_add_data(&state->chip, state); ret = gpiochip_add_data(&state->chip, state);
if (ret) { if (ret) {
dev_err(state->dev, "can't add gpio chip\n"); dev_err(state->dev, "can't add gpio chip\n");
goto err_chip; return ret;
} }
ret = gpiochip_add_pin_range(&state->chip, dev_name(dev), 0, 0, npins); ret = gpiochip_add_pin_range(&state->chip, dev_name(dev), 0, 0, npins);
@ -784,8 +784,6 @@ static int pmic_gpio_probe(struct platform_device *pdev)
err_range: err_range:
gpiochip_remove(&state->chip); gpiochip_remove(&state->chip);
err_chip:
pinctrl_unregister(state->ctrl);
return ret; return ret;
} }
@ -794,7 +792,6 @@ static int pmic_gpio_remove(struct platform_device *pdev)
struct pmic_gpio_state *state = platform_get_drvdata(pdev); struct pmic_gpio_state *state = platform_get_drvdata(pdev);
gpiochip_remove(&state->chip); gpiochip_remove(&state->chip);
pinctrl_unregister(state->ctrl);
return 0; return 0;
} }