Btrfs: fix release reserved extents trace points

[mirror_ubuntu-bionic-kernel.git] / drivers / pinctrl / pinctrl-zynq.c

diff --git a/drivers/pinctrl/pinctrl-zynq.c b/drivers/pinctrl/pinctrl-zynq.c
index 76f1abd71e31f351c687112db3600e1b9551c97f..8fdc60c5aeaf73c375e9258c57157c9fec52a758 100644 (file)
--- a/drivers/pinctrl/pinctrl-zynq.c
+++ b/drivers/pinctrl/pinctrl-zynq.c
@@ -862,7 +862,7 @@ static const struct pinctrl_ops zynq_pctrl_ops = {
        .get_group_name = zynq_pctrl_get_group_name,
        .get_group_pins = zynq_pctrl_get_group_pins,
        .dt_node_to_map = pinconf_generic_dt_node_to_map_all,
-       .dt_free_map = pinctrl_utils_dt_free_map,
+       .dt_free_map = pinctrl_utils_free_map,
 };
 
 /* pinmux */
@@ -1195,7 +1195,7 @@ static int zynq_pinctrl_probe(struct platform_device *pdev)
        pctrl->funcs = zynq_pmux_functions;
        pctrl->nfuncs = ARRAY_SIZE(zynq_pmux_functions);
 
-       pctrl->pctrl = pinctrl_register(&zynq_desc, &pdev->dev, pctrl);
+       pctrl->pctrl = devm_pinctrl_register(&pdev->dev, &zynq_desc, pctrl);
        if (IS_ERR(pctrl->pctrl))
                return PTR_ERR(pctrl->pctrl);
 
@@ -1206,15 +1206,6 @@ static int zynq_pinctrl_probe(struct platform_device *pdev)
        return 0;
 }
 
-static int zynq_pinctrl_remove(struct platform_device *pdev)
-{
-       struct zynq_pinctrl *pctrl = platform_get_drvdata(pdev);
-
-       pinctrl_unregister(pctrl->pctrl);
-
-       return 0;
-}
-
 static const struct of_device_id zynq_pinctrl_of_match[] = {
        { .compatible = "xlnx,pinctrl-zynq" },
        { }
@@ -1227,7 +1218,6 @@ static struct platform_driver zynq_pinctrl_driver = {
                .of_match_table = zynq_pinctrl_of_match,
        },
        .probe = zynq_pinctrl_probe,
-       .remove = zynq_pinctrl_remove,
 };
 
 static int __init zynq_pinctrl_init(void)