On Wed 24 Feb 05:15 PST 2016, Laxman Dewangan wrote: > Use devm_pinctrl_register() for pin control registration and clean > the error path. > > Signed-off-by: Laxman Dewangan <ldewangan@xxxxxxxxxx> > Cc: "Ivan T. Ivanov" <ivan.ivanov@xxxxxxxxxx> > Cc: Lee Jones <lee.jones@xxxxxxxxxx> > Cc: Stephen Boyd <sboyd@xxxxxxxxxxxxxx> > Cc: Jonas Gorski <jogo@xxxxxxxxxxx> > --- Reviewed-by Bjorn Andersson <bjorn.andersson@xxxxxxxxxx> Regards, Bjorn > drivers/pinctrl/qcom/pinctrl-spmi-gpio.c | 7 ++----- > 1 file changed, 2 insertions(+), 5 deletions(-) > > diff --git a/drivers/pinctrl/qcom/pinctrl-spmi-gpio.c b/drivers/pinctrl/qcom/pinctrl-spmi-gpio.c > index 4e12ded..330e822 100644 > --- a/drivers/pinctrl/qcom/pinctrl-spmi-gpio.c > +++ b/drivers/pinctrl/qcom/pinctrl-spmi-gpio.c > @@ -764,14 +764,14 @@ static int pmic_gpio_probe(struct platform_device *pdev) > state->chip.of_gpio_n_cells = 2; > 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)) > return PTR_ERR(state->ctrl); > > ret = gpiochip_add_data(&state->chip, state); > if (ret) { > 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); > @@ -784,8 +784,6 @@ static int pmic_gpio_probe(struct platform_device *pdev) > > err_range: > gpiochip_remove(&state->chip); > -err_chip: > - pinctrl_unregister(state->ctrl); > return ret; > } > > @@ -794,7 +792,6 @@ static int pmic_gpio_remove(struct platform_device *pdev) > struct pmic_gpio_state *state = platform_get_drvdata(pdev); > > gpiochip_remove(&state->chip); > - pinctrl_unregister(state->ctrl); > return 0; > } > > -- > 2.1.4 > -- To unsubscribe from this list: send the line "unsubscribe linux-gpio" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html