Merge remote-tracking branch 'pinctrl/for-next'

[deliverable/linux.git] / drivers / pinctrl / pinctrl-palmas.c

diff --git a/drivers/pinctrl/pinctrl-palmas.c b/drivers/pinctrl/pinctrl-palmas.c
index 8edb3f8c72c820eea3814f4defd01a8891ecd442..a30146da7ffdcb6a72513b87d692a49527a5d16c 100644 (file)
--- a/drivers/pinctrl/pinctrl-palmas.c
+++ b/drivers/pinctrl/pinctrl-palmas.c
@@ -1004,9 +1004,7 @@ static int palmas_pinctrl_probe(struct platform_device *pdev)
        bool enable_dvfs2 = false;
 
        if (pdev->dev.of_node) {
-               const struct of_device_id *match;
-               match = of_match_device(palmas_pinctrl_of_match, &pdev->dev);
-               pinctrl_data = match->data;
+               pinctrl_data = of_device_get_match_data(&pdev->dev);
                enable_dvfs1 = of_property_read_bool(pdev->dev.of_node,
                                        "ti,palmas-enable-dvfs1");
                enable_dvfs2 = of_property_read_bool(pdev->dev.of_node,