lkml.org 
[lkml]   [2012]   [Aug]   [7]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
Date
From
SubjectRe: thermal patches in linux-next

Hi Zhang

Thank you for your hard work

> I just created a git tree for catching all thermal changes.
> http://git.kernel.org/?p=linux/kernel/git/rzhang/linux.git;a=summary
> and I also created the next branch, which I'd like to be set for
> linux-next inclusion, but don't know how.
>
> And, I just saw that there are a couple of thermal patches in
> linux-next, which I think it would be better if they can be re-based on
> my next branch first.
> For Guenter's and Kuninori's patch, I can take them directly, with few
> changes.

Thank you.
I tried merge your tree + linux-next/master , and tested it.
My driver needs additional patch

my driver on linux-next/master is 6d0c7e61d36a3b72e19d9c2d31bf36d11c57ed57.
additional patch is

========================================================================
Subject: [PATCH] thermal: rcaar_thermal: tidyup thermal_zone_device_register() parameter
From: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Date: Tue, 7 Aug 2012 13:32:14 +0900

c56f5c0342dfee11a1a13d2f5bb7618de5b17590
(Thermal: Make Thermal trip points writeable)
added "mask", and
062f7fed5c79b3d2f7274fcd6f05f8c8f2fa5674
(Thermal: Remove tc1/tc2 in generic thermal layer.)
removed tc1/tc2 from thermal_zone_device_register()
This patch tidyup rcar_thereml driver.

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
---
drivers/thermal/rcar_thermal.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/thermal/rcar_thermal.c b/drivers/thermal/rcar_thermal.c
index 2496b4f..f7a1b57 100644
--- a/drivers/thermal/rcar_thermal.c
+++ b/drivers/thermal/rcar_thermal.c
@@ -210,8 +210,8 @@ static int rcar_thermal_probe(struct platform_device *pdev)
goto error_free_priv;
}

- zone = thermal_zone_device_register("rcar_thermal", 0, priv,
- &rcar_thermal_zone_ops, 0, 0, 0, 0);
+ zone = thermal_zone_device_register("rcar_thermal", 0, 0, priv,
+ &rcar_thermal_zone_ops, 0, 0);
if (IS_ERR(zone)) {
dev_err(&pdev->dev, "thermal zone device is NULL\n");
ret = PTR_ERR(zone);
--
1.7.5.4
========================================================================

Best regards
---
Kuninori Morimoto

\
 
 \ /
  Last update: 2012-08-07 07:21    [W:0.530 / U:0.016 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site