[03/14] thermal: exynos: Read soc_type from match data

Commit Message

Bartlomiej Zolnierkiewicz April 16, 2018, 10:11 a.m. UTC

From: Maciej Purski <[e-mail]>

Device context's field data->soc is currently obtained by comparing
of_compatible's. Provide soc_type as .data field in device's match
table, as it is done in most drivers.

Signed-off-by: Maciej Purski <[e-mail]>
Signed-off-by: Bartlomiej Zolnierkiewicz <[e-mail]>
---
 drivers/thermal/samsung/exynos_tmu.c | 74 +++++++++++++++++-------------------
 1 file changed, 34 insertions(+), 40 deletions(-)

Comments

Daniel Lezcano April 16, 2018, 12:19 p.m. UTC | #1

On 16/04/2018 12:11, Bartlomiej Zolnierkiewicz wrote:
> From: Maciej Purski <[e-mail]>
> 
> Device context's field data->soc is currently obtained by comparing
> of_compatible's. Provide soc_type as .data field in device's match
> table, as it is done in most drivers.
> 
> Signed-off-by: Maciej Purski <[e-mail]>
> Signed-off-by: Bartlomiej Zolnierkiewicz <[e-mail]>
> ---

Acked-by: Daniel Lezcano <[e-mail]>

Bartlomiej Zolnierkiewicz April 16, 2018, 12:41 p.m. UTC | #2

On Monday, April 16, 2018 02:19:30 PM Daniel Lezcano wrote:
> On 16/04/2018 12:11, Bartlomiej Zolnierkiewicz wrote:
> > From: Maciej Purski <[e-mail]>
> > 
> > Device context's field data->soc is currently obtained by comparing
> > of_compatible's. Provide soc_type as .data field in device's match
> > table, as it is done in most drivers.
> > 
> > Signed-off-by: Maciej Purski <[e-mail]>
> > Signed-off-by: Bartlomiej Zolnierkiewicz <[e-mail]>
> > ---
> 
> Acked-by: Daniel Lezcano <[e-mail]>

Zhang & Eduardo are Thermal Maintainers (+ I'm Maintainer for
Samsung Thermal) so I assume you meant "Reviewed-by:"?

Best regards,
--
Bartlomiej Zolnierkiewicz
Samsung R&D Institute Poland
Samsung Electronics

Daniel Lezcano April 16, 2018, 12:47 p.m. UTC | #3

On 16/04/2018 14:41, Bartlomiej Zolnierkiewicz wrote:
> On Monday, April 16, 2018 02:19:30 PM Daniel Lezcano wrote:
>> On 16/04/2018 12:11, Bartlomiej Zolnierkiewicz wrote:
>>> From: Maciej Purski <[e-mail]>
>>>
>>> Device context's field data->soc is currently obtained by comparing
>>> of_compatible's. Provide soc_type as .data field in device's match
>>> table, as it is done in most drivers.
>>>
>>> Signed-off-by: Maciej Purski <[e-mail]>
>>> Signed-off-by: Bartlomiej Zolnierkiewicz <[e-mail]>
>>> ---
>>
>> Acked-by: Daniel Lezcano <[e-mail]>
> 
> Zhang & Eduardo are Thermal Maintainers (+ I'm Maintainer for
> Samsung Thermal) so I assume you meant "Reviewed-by:"?

I meant Acked-by :) I don't have to be a subsystem maintainer to ack a
patch. The reviewed-by has a stronger statement than the acked-by.

The patch looks good to me.

Patch

diff --git a/drivers/thermal/samsung/exynos_tmu.c b/drivers/thermal/samsung/exynos_tmu.c
index ac83f72..d7a3c3c 100644
--- a/drivers/thermal/samsung/exynos_tmu.c
+++ b/drivers/thermal/samsung/exynos_tmu.c
@@ -29,7 +29,7 @@ 
 #include <linux/io.h>
 #include <linux/interrupt.h>
 #include <linux/module.h>
-#include <linux/of.h>
+#include <linux/of_device.h>
 #include <linux/of_address.h>
 #include <linux/of_irq.h>
 #include <linux/platform_device.h>
@@ -1105,47 +1105,41 @@  static irqreturn_t exynos_tmu_irq(int irq, void *id)
 }
 
 static const struct of_device_id exynos_tmu_match[] = {
-	{ .compatible = "samsung,exynos3250-tmu", },
-	{ .compatible = "samsung,exynos4210-tmu", },
-	{ .compatible = "samsung,exynos4412-tmu", },
-	{ .compatible = "samsung,exynos5250-tmu", },
-	{ .compatible = "samsung,exynos5260-tmu", },
-	{ .compatible = "samsung,exynos5420-tmu", },
-	{ .compatible = "samsung,exynos5420-tmu-ext-triminfo", },
-	{ .compatible = "samsung,exynos5433-tmu", },
-	{ .compatible = "samsung,exynos5440-tmu", },
-	{ .compatible = "samsung,exynos7-tmu", },
-	{ /* sentinel */ },
+	{
+		.compatible = "samsung,exynos3250-tmu",
+		.data = (const void *)SOC_ARCH_EXYNOS3250,
+	}, {
+		.compatible = "samsung,exynos4210-tmu",
+		.data = (const void *)SOC_ARCH_EXYNOS4210,
+	}, {
+		.compatible = "samsung,exynos4412-tmu",
+		.data = (const void *)SOC_ARCH_EXYNOS4412,
+	}, {
+		.compatible = "samsung,exynos5250-tmu",
+		.data = (const void *)SOC_ARCH_EXYNOS5250,
+	}, {
+		.compatible = "samsung,exynos5260-tmu",
+		.data = (const void *)SOC_ARCH_EXYNOS5260,
+	}, {
+		.compatible = "samsung,exynos5420-tmu",
+		.data = (const void *)SOC_ARCH_EXYNOS5420,
+	}, {
+		.compatible = "samsung,exynos5420-tmu-ext-triminfo",
+		.data = (const void *)SOC_ARCH_EXYNOS5420_TRIMINFO,
+	}, {
+		.compatible = "samsung,exynos5433-tmu",
+		.data = (const void *)SOC_ARCH_EXYNOS5433,
+	}, {
+		.compatible = "samsung,exynos5440-tmu",
+		.data = (const void *)SOC_ARCH_EXYNOS5440,
+	}, {
+		.compatible = "samsung,exynos7-tmu",
+		.data = (const void *)SOC_ARCH_EXYNOS7,
+	},
+	{ },
 };
 MODULE_DEVICE_TABLE(of, exynos_tmu_match);
 
-static int exynos_of_get_soc_type(struct device_node *np)
-{
-	if (of_device_is_compatible(np, "samsung,exynos3250-tmu"))
-		return SOC_ARCH_EXYNOS3250;
-	else if (of_device_is_compatible(np, "samsung,exynos4210-tmu"))
-		return SOC_ARCH_EXYNOS4210;
-	else if (of_device_is_compatible(np, "samsung,exynos4412-tmu"))
-		return SOC_ARCH_EXYNOS4412;
-	else if (of_device_is_compatible(np, "samsung,exynos5250-tmu"))
-		return SOC_ARCH_EXYNOS5250;
-	else if (of_device_is_compatible(np, "samsung,exynos5260-tmu"))
-		return SOC_ARCH_EXYNOS5260;
-	else if (of_device_is_compatible(np, "samsung,exynos5420-tmu"))
-		return SOC_ARCH_EXYNOS5420;
-	else if (of_device_is_compatible(np,
-					 "samsung,exynos5420-tmu-ext-triminfo"))
-		return SOC_ARCH_EXYNOS5420_TRIMINFO;
-	else if (of_device_is_compatible(np, "samsung,exynos5433-tmu"))
-		return SOC_ARCH_EXYNOS5433;
-	else if (of_device_is_compatible(np, "samsung,exynos5440-tmu"))
-		return SOC_ARCH_EXYNOS5440;
-	else if (of_device_is_compatible(np, "samsung,exynos7-tmu"))
-		return SOC_ARCH_EXYNOS7;
-
-	return -EINVAL;
-}
-
 static int exynos_of_sensor_conf(struct device_node *np,
 				 struct exynos_tmu_platform_data *pdata)
 {
@@ -1219,7 +1213,7 @@  static int exynos_map_dt_data(struct platform_device *pdev)
 
 	exynos_of_sensor_conf(pdev->dev.of_node, pdata);
 	data->pdata = pdata;
-	data->soc = exynos_of_get_soc_type(pdev->dev.of_node);
+	data->soc = (enum soc_type)of_device_get_match_data(&pdev->dev);
 
 	switch (data->soc) {
 	case SOC_ARCH_EXYNOS4210: