rtc: omap: Use device_get_match_data()
PATCH 1/1 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 <[email protected]>
--- drivers/rtc/rtc-omap.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-)
drivers/rtc/rtc-omap.c +3 -5
@@ -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 {
Signature · 1 line
2.42.0
Quoted 5 lines · Rob Herring
Use preferred
device_get_match_data()instead ofof_match_device()to get the driver match data. With this, adjust the includes to explicitly include the correct headers.
Applied, thanks!
[1/1] rtc: omap: Use device_get_match_data()
commit: 3c8bdc20a44fd0126e331e0623e7daf00d186135
Best regards,
Signature · 3 lines
Alexandre Belloni, co-owner and COO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com