|
@@ -877,14 +877,14 @@ static int pmic_mpp_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);
|
|
@@ -897,8 +897,6 @@ static int pmic_mpp_probe(struct platform_device *pdev)
|
|
|
|
|
|
err_range:
|
|
|
gpiochip_remove(&state->chip);
|
|
|
-err_chip:
|
|
|
- pinctrl_unregister(state->ctrl);
|
|
|
return ret;
|
|
|
}
|
|
|
|
|
@@ -907,7 +905,6 @@ static int pmic_mpp_remove(struct platform_device *pdev)
|
|
|
struct pmic_mpp_state *state = platform_get_drvdata(pdev);
|
|
|
|
|
|
gpiochip_remove(&state->chip);
|
|
|
- pinctrl_unregister(state->ctrl);
|
|
|
return 0;
|
|
|
}
|
|
|
|