summaryrefslogtreecommitdiff
path: root/drivers/pinctrl/mvebu/pinctrl-kirkwood.c
diff options
context:
space:
mode:
authorRob Herring <robh@kernel.org>2023-10-09 20:29:13 +0300
committerLinus Walleij <linus.walleij@linaro.org>2023-10-30 16:50:42 +0300
commit63bffc2d3a99eaabc786c513eea71be3f597f175 (patch)
treec3c61b3830c55f7769c8d51733728b0d25aea8b5 /drivers/pinctrl/mvebu/pinctrl-kirkwood.c
parente2b0bac1aae44d603817b55d62553f3d3557d5a7 (diff)
downloadlinux-63bffc2d3a99eaabc786c513eea71be3f597f175.tar.xz
pinctrl: Use device_get_match_data()
Use preferred device_get_match_data() instead of of_match_device() to get the driver match data. With this, adjust the includes to explicitly include the correct headers. Signed-off-by: Rob Herring <robh@kernel.org> Reviewed-by: Florian Fainelli <florian.fainelli@broadcom.com> Link: https://lore.kernel.org/r/20231009172923.2457844-18-robh@kernel.org Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Diffstat (limited to 'drivers/pinctrl/mvebu/pinctrl-kirkwood.c')
-rw-r--r--drivers/pinctrl/mvebu/pinctrl-kirkwood.c7
1 files changed, 2 insertions, 5 deletions
diff --git a/drivers/pinctrl/mvebu/pinctrl-kirkwood.c b/drivers/pinctrl/mvebu/pinctrl-kirkwood.c
index d45c31f281c8..4789d7442f78 100644
--- a/drivers/pinctrl/mvebu/pinctrl-kirkwood.c
+++ b/drivers/pinctrl/mvebu/pinctrl-kirkwood.c
@@ -11,8 +11,8 @@
#include <linux/platform_device.h>
#include <linux/clk.h>
#include <linux/of.h>
-#include <linux/of_device.h>
#include <linux/pinctrl/pinctrl.h>
+#include <linux/property.h>
#include "pinctrl-mvebu.h"
@@ -470,10 +470,7 @@ static const struct of_device_id kirkwood_pinctrl_of_match[] = {
static int kirkwood_pinctrl_probe(struct platform_device *pdev)
{
- const struct of_device_id *match =
- of_match_device(kirkwood_pinctrl_of_match, &pdev->dev);
-
- pdev->dev.platform_data = (void *)match->data;
+ pdev->dev.platform_data = (void *)device_get_match_data(&pdev->dev);
return mvebu_pinctrl_simple_mmio_probe(pdev);
}