From: Ladislav Michl <la...@linux-mips.org>

In the case of device tree boot the device platform data is usually
NULL so hook the platform data obtained from the match.
As part of un-constify the platform_data pointer.

Signed-off-by: Ladislav Michl <la...@linux-mips.org>
Signed-off-by: Keerthy <j-keer...@ti.com>
Reviewed-by: Sebastian Reichel <sebastian.reic...@collabora.co.uk>
---
 drivers/clocksource/timer-ti-dm.c | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/drivers/clocksource/timer-ti-dm.c 
b/drivers/clocksource/timer-ti-dm.c
index 864019d..c5a49a3 100644
--- a/drivers/clocksource/timer-ti-dm.c
+++ b/drivers/clocksource/timer-ti-dm.c
@@ -806,14 +806,16 @@ static int omap_dm_timer_probe(struct platform_device 
*pdev)
        struct omap_dm_timer *timer;
        struct resource *mem, *irq;
        struct device *dev = &pdev->dev;
-       const struct of_device_id *match;
        const struct dmtimer_platform_data *pdata;
        int ret;
 
-       match = of_match_device(of_match_ptr(omap_timer_match), dev);
-       pdata = match ? match->data : dev->platform_data;
+       pdata = of_device_get_match_data(dev);
+       if (!pdata)
+               pdata = dev_get_platdata(dev);
+       else
+               dev->platform_data = (void *)pdata;
 
-       if (!pdata && !dev->of_node) {
+       if (!pdata) {
                dev_err(dev, "%s: no platform data.\n", __func__);
                return -ENODEV;
        }
-- 
1.9.1

Reply via email to