rtc: omap: 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>
Link: https://lore.kernel.org/r/20231009211356.3242037-12-robh@kernel.org
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>

diff --git a/drivers/rtc/rtc-omap.c b/drivers/rtc/rtc-omap.c
index 5b10ab06cd2e2fa7df95808768fc4606b674b08c..c6155c48a4ac4d627c1ac9bca480ea816f04f9e1 100644 (file)
--- a/drivers/rtc/rtc-omap.c
+++ b/drivers/rtc/rtc-omap.c
@@ -18,12 +18,12 @@
 #include <linux/kernel.h>
 #include <linux/module.h>
 #include <linux/of.h>
-#include <linux/of_device.h>
 #include <linux/pinctrl/pinctrl.h>
 #include <linux/pinctrl/pinconf.h>
 #include <linux/pinctrl/pinconf-generic.h>
 #include <linux/platform_device.h>
 #include <linux/pm_runtime.h>
+#include <linux/property.h>
 #include <linux/rtc.h>
 #include <linux/rtc/rtc-omap.h>
 
@@ -729,16 +729,14 @@ static int omap_rtc_probe(struct platform_device *pdev)
        struct omap_rtc *rtc;
        u8 reg, mask, new_ctrl;
        const struct platform_device_id *id_entry;
-       const struct of_device_id *of_id;
        int ret;
 
        rtc = devm_kzalloc(&pdev->dev, sizeof(*rtc), GFP_KERNEL);
        if (!rtc)
                return -ENOMEM;
 
-       of_id = of_match_device(omap_rtc_of_match, &pdev->dev);
-       if (of_id) {
-               rtc->type = of_id->data;
+       rtc->type = device_get_match_data(&pdev->dev);
+       if (rtc->type) {
                rtc->is_pmic_controller = rtc->type->has_pmic_mode &&
                        of_device_is_system_power_controller(pdev->dev.of_node);
        } else {