Merge branch 'drm-next-4.7' of git://people.freedesktop.org/~agd5f/linux into drm...

[cascardo/linux.git] / drivers / pinctrl / pinctrl-tb10x.c

diff --git a/drivers/pinctrl/pinctrl-tb10x.c b/drivers/pinctrl/pinctrl-tb10x.c
index 6546b9b..edfba50 100644 (file)
--- a/drivers/pinctrl/pinctrl-tb10x.c
+++ b/drivers/pinctrl/pinctrl-tb10x.c
@@ -582,7 +582,7 @@ static struct pinctrl_ops tb10x_pinctrl_ops = {
        .get_group_name   = tb10x_get_group_name,
        .get_group_pins   = tb10x_get_group_pins,
        .dt_node_to_map   = tb10x_dt_node_to_map,
-       .dt_free_map      = pinctrl_utils_dt_free_map,
+       .dt_free_map      = pinctrl_utils_free_map,
 };
 
 static int tb10x_get_functions_count(struct pinctrl_dev *pctl)
@@ -806,7 +806,7 @@ static int tb10x_pinctrl_probe(struct platform_device *pdev)
                }
        }
 
-       state->pctl = pinctrl_register(&tb10x_pindesc, dev, state);
+       state->pctl = devm_pinctrl_register(dev, &tb10x_pindesc, state);
        if (IS_ERR(state->pctl)) {
                dev_err(dev, "could not register TB10x pin driver\n");
                ret = PTR_ERR(state->pctl);
@@ -824,7 +824,6 @@ static int tb10x_pinctrl_remove(struct platform_device *pdev)
 {
        struct tb10x_pinctrl *state = platform_get_drvdata(pdev);
 
-       pinctrl_unregister(state->pctl);
        mutex_destroy(&state->mutex);
 
        return 0;