media: ir-hix5hd2: 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>
Signed-off-by: Sean Young <sean@mess.org>
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>

diff --git a/drivers/media/rc/ir-hix5hd2.c b/drivers/media/rc/ir-hix5hd2.c
index 0034f615b4660ea2b43abdf2b088a1e000cd2255..de5bb9a08ea4c013bbf36bb020fa23b4aa698891 100644 (file)
--- a/drivers/media/rc/ir-hix5hd2.c
+++ b/drivers/media/rc/ir-hix5hd2.c
@@ -9,7 +9,9 @@
 #include <linux/interrupt.h>
 #include <linux/mfd/syscon.h>
 #include <linux/module.h>
-#include <linux/of_device.h>
+#include <linux/of.h>
+#include <linux/platform_device.h>
+#include <linux/property.h>
 #include <linux/regmap.h>
 #include <media/rc-core.h>
 
@@ -251,7 +253,6 @@ static int hix5hd2_ir_probe(struct platform_device *pdev)
        struct device *dev = &pdev->dev;
        struct hix5hd2_ir_priv *priv;
        struct device_node *node = pdev->dev.of_node;
-       const struct of_device_id *of_id;
        const char *map_name;
        int ret;
 
@@ -259,12 +260,11 @@ static int hix5hd2_ir_probe(struct platform_device *pdev)
        if (!priv)
                return -ENOMEM;
 
-       of_id = of_match_device(hix5hd2_ir_table, dev);
-       if (!of_id) {
+       priv->socdata = device_get_match_data(dev);
+       if (!priv->socdata) {
                dev_err(dev, "Unable to initialize IR data\n");
                return -ENODEV;
        }
-       priv->socdata = of_id->data;
 
        priv->regmap = syscon_regmap_lookup_by_phandle(node,
                                                       "hisilicon,power-syscon");