linux-kernel - [PATCH v6 07/10] clocksource: timer-dm: Hook device platform data if not already assigned

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <1514887799-24605-8-git-send-email-j-keerthy@ti.com>
Date:   Tue, 2 Jan 2018 15:39:56 +0530
From:   Keerthy <j-keerthy@...com>
To:     <daniel.lezcano@...aro.org>, <tony@...mide.com>,
        <aaro.koskinen@....fi>, <thierry.reding@...il.com>
CC:     <ladis@...ux-mips.org>, <grygorii.strashko@...com>,
        <linux-omap@...r.kernel.org>, <robh+dt@...nel.org>,
        <linux-arm-kernel@...ts.infradead.org>,
        <linux-pwm@...r.kernel.org>, <sebastian.reichel@...labora.co.uk>,
        <linux-kernel@...r.kernel.org>, <t-kristo@...com>,
        <j-keerthy@...com>
Subject: [PATCH v6 07/10] clocksource: timer-dm: Hook device platform data if not already assigned

From: Ladislav Michl <ladis@...ux-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 <ladis@...ux-mips.org>
Signed-off-by: Keerthy <j-keerthy@...com>
---
 drivers/clocksource/timer-dm.c | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/drivers/clocksource/timer-dm.c b/drivers/clocksource/timer-dm.c
index 1cbd954..60db173 100644
--- a/drivers/clocksource/timer-dm.c
+++ b/drivers/clocksource/timer-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