following were the errors reported
drivers/thermal/rcar_thermal.c: In function ‘rcar_thermal_probe’:
drivers/thermal/rcar_thermal.c:214:10: warning: passing argument 3 of ‘thermal_zone_device_register’ makes integer from pointer without a cast [enabled by default]
include/linux/thermal.h:166:29: note: expected ‘int’ but argument is of type ‘struct rcar_thermal_priv *’
drivers/thermal/rcar_thermal.c:214:10: error: too few arguments to function ‘thermal_zone_device_register’
include/linux/thermal.h:166:29: note: declared here
make[1]: *** [drivers/thermal/rcar_thermal.o] Error 1
make: *** [drivers/thermal/rcar_thermal.o] Error 2
with gcc version 4.6.3 (Ubuntu/Linaro 4.6.3-1ubuntu5)
Signed-off-by: Devendra Naga <[email protected]>
---
drivers/thermal/rcar_thermal.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/thermal/rcar_thermal.c b/drivers/thermal/rcar_thermal.c
index d445271..f7a1b57 100644
--- a/drivers/thermal/rcar_thermal.c
+++ b/drivers/thermal/rcar_thermal.c
@@ -210,7 +210,7 @@ static int rcar_thermal_probe(struct platform_device *pdev)
goto error_free_priv;
}
- zone = thermal_zone_device_register("rcar_thermal", 0, priv,
+ 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");
--
1.7.9.5
Hi
> following were the errors reported
>
> drivers/thermal/rcar_thermal.c: In function $B!F(Brcar_thermal_probe$B!G(B:
> drivers/thermal/rcar_thermal.c:214:10: warning: passing argument 3 of $B!F(Bthermal_zone_device_register$B!G(B makes integer from pointer without a cast [enabled by default]
> include/linux/thermal.h:166:29: note: expected $B!F(Bint$B!G(B but argument is of type $B!F(Bstruct rcar_thermal_priv *$B!G(B
> drivers/thermal/rcar_thermal.c:214:10: error: too few arguments to function $B!F(Bthermal_zone_device_register$B!G(B
> include/linux/thermal.h:166:29: note: declared here
> make[1]: *** [drivers/thermal/rcar_thermal.o] Error 1
> make: *** [drivers/thermal/rcar_thermal.o] Error 2
>
> with gcc version 4.6.3 (Ubuntu/Linaro 4.6.3-1ubuntu5)
>
> Signed-off-by: Devendra Naga <[email protected]>
> ---
Acked-by: Kuninori Morimoto <[email protected]>
Best regards
---
Kuninori Morimoto
devm_kfree and devm_iounmap should not have to be explicitly used
Signed-off-by: Kuninori Morimoto <[email protected]>
---
This patch is based on Devendra's
[PATCH] thermal: solve compilation errors in rcar_thermal
drivers/thermal/rcar_thermal.c | 18 ++----------------
1 file changed, 2 insertions(+), 16 deletions(-)
diff --git a/drivers/thermal/rcar_thermal.c b/drivers/thermal/rcar_thermal.c
index 762f637..81dce23 100644
--- a/drivers/thermal/rcar_thermal.c
+++ b/drivers/thermal/rcar_thermal.c
@@ -185,7 +185,6 @@ static int rcar_thermal_probe(struct platform_device *pdev)
struct thermal_zone_device *zone;
struct rcar_thermal_priv *priv;
struct resource *res;
- int ret;
res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
if (!res) {
@@ -206,16 +205,14 @@ static int rcar_thermal_probe(struct platform_device *pdev)
res->start, resource_size(res));
if (!priv->base) {
dev_err(&pdev->dev, "Unable to ioremap thermal register\n");
- ret = -ENOMEM;
- goto error_free_priv;
+ return -ENOMEM;
}
zone = thermal_zone_device_register("rcar_thermal", 0, 0, priv,
&rcar_thermal_zone_ops, NULL, 0, 0);
if (IS_ERR(zone)) {
dev_err(&pdev->dev, "thermal zone device is NULL\n");
- ret = PTR_ERR(zone);
- goto error_iounmap;
+ return PTR_ERR(zone);
}
platform_set_drvdata(pdev, zone);
@@ -223,26 +220,15 @@ static int rcar_thermal_probe(struct platform_device *pdev)
dev_info(&pdev->dev, "proved\n");
return 0;
-
-error_iounmap:
- devm_iounmap(&pdev->dev, priv->base);
-error_free_priv:
- devm_kfree(&pdev->dev, priv);
-
- return ret;
}
static int rcar_thermal_remove(struct platform_device *pdev)
{
struct thermal_zone_device *zone = platform_get_drvdata(pdev);
- struct rcar_thermal_priv *priv = zone->devdata;
thermal_zone_device_unregister(zone);
platform_set_drvdata(pdev, NULL);
- devm_iounmap(&pdev->dev, priv->base);
- devm_kfree(&pdev->dev, priv);
-
return 0;
}
--
1.7.9.5
This patch fixup following error
${LINUX}/drivers/thermal/rcar_thermal.c: In function 'rcar_thermal_probe':
${LINUX}/drivers/thermal/rcar_thermal.c:214:9: warning: passing argument 3 \
of 'thermal_zone_device_register' makes integer from pointer without\
a cast [enabled by default]
${LINUX}/include/linux/thermal.h:215:29: note: expected 'int' but argument \
is of type 'struct rcar_thermal_priv *'
${LINUX}/drivers/thermal/rcar_thermal.c:214:9:\
error: too few arguments to function 'thermal_zone_device_register'
Signed-off-by: Devendra Naga <[email protected]>
Signed-off-by: Kuninori Morimoto <[email protected]>
---
for linus/master branch
drivers/thermal/rcar_thermal.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/thermal/rcar_thermal.c b/drivers/thermal/rcar_thermal.c
index b13fe5d..762f637 100644
--- a/drivers/thermal/rcar_thermal.c
+++ b/drivers/thermal/rcar_thermal.c
@@ -210,7 +210,7 @@ static int rcar_thermal_probe(struct platform_device *pdev)
goto error_free_priv;
}
- zone = thermal_zone_device_register("rcar_thermal", 0, priv,
+ zone = thermal_zone_device_register("rcar_thermal", 0, 0, priv,
&rcar_thermal_zone_ops, NULL, 0, 0);
if (IS_ERR(zone)) {
dev_err(&pdev->dev, "thermal zone device is NULL\n");
--
1.7.9.5
Hi Zhang, Andrew
This patch is needed on latest linus/master branch.
Please re-check this patch.
And, similar patch was added on linux-next/master branch
b5da4e6d5603633835a1da267e0e699eea66f317
(Thermal: Pass zone parameters as argument to tzd_register)
but it seems wrong (?)
At Tue, 21 Aug 2012 22:01:36 +0530,
Devendra Naga wrote:
>
> following were the errors reported
>
> drivers/thermal/rcar_thermal.c: In function $B!F(Brcar_thermal_probe$B!G(B:
> drivers/thermal/rcar_thermal.c:214:10: warning: passing argument 3 of $B!F(Bthermal_zone_device_register$B!G(B makes integer from pointer without a cast [enabled by default]
> include/linux/thermal.h:166:29: note: expected $B!F(Bint$B!G(B but argument is of type $B!F(Bstruct rcar_thermal_priv *$B!G(B
> drivers/thermal/rcar_thermal.c:214:10: error: too few arguments to function $B!F(Bthermal_zone_device_register$B!G(B
> include/linux/thermal.h:166:29: note: declared here
> make[1]: *** [drivers/thermal/rcar_thermal.o] Error 1
> make: *** [drivers/thermal/rcar_thermal.o] Error 2
>
> with gcc version 4.6.3 (Ubuntu/Linaro 4.6.3-1ubuntu5)
>
> Signed-off-by: Devendra Naga <[email protected]>
> ---
> drivers/thermal/rcar_thermal.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/thermal/rcar_thermal.c b/drivers/thermal/rcar_thermal.c
> index d445271..f7a1b57 100644
> --- a/drivers/thermal/rcar_thermal.c
> +++ b/drivers/thermal/rcar_thermal.c
> @@ -210,7 +210,7 @@ static int rcar_thermal_probe(struct platform_device *pdev)
> goto error_free_priv;
> }
>
> - zone = thermal_zone_device_register("rcar_thermal", 0, priv,
> + 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");
> --
> 1.7.9.5
>
Best regards
---
Kuninori Morimoto
Sorry, I can not see the original post of this patch.
Can you resend it so that I can apply it?
> -----Original Message-----
> From: kuninori morimoto [mailto:[email protected]] On
> Behalf Of Kuninori Morimoto
> Sent: Wednesday, October 31, 2012 11:21 AM
> To: Andrew Morton; Zhang, Rui; [email protected]
> Cc: Wu, Fengguang
> Subject: Re: [PATCH] thermal: solve compilation errors in rcar_thermal
> Importance: High
>
>
> Hi Zhang, Andrew
>
> This patch is needed on latest linus/master branch.
> Please re-check this patch.
>
> And, similar patch was added on linux-next/master branch
> b5da4e6d5603633835a1da267e0e699eea66f317
> (Thermal: Pass zone parameters as argument to tzd_register) but it
> seems wrong (?)
>
> At Tue, 21 Aug 2012 22:01:36 +0530,
> Devendra Naga wrote:
> >
> > following were the errors reported
> >
> > drivers/thermal/rcar_thermal.c: In function 'rcar_thermal_probe':
> > drivers/thermal/rcar_thermal.c:214:10: warning: passing argument 3 of
> > 'thermal_zone_device_register' makes integer from pointer without a
> > cast [enabled by default]
> > include/linux/thermal.h:166:29: note: expected 'int' but argument is
> of type 'struct rcar_thermal_priv *'
> > drivers/thermal/rcar_thermal.c:214:10: error: too few arguments to
> function 'thermal_zone_device_register'
> > include/linux/thermal.h:166:29: note: declared here
> > make[1]: *** [drivers/thermal/rcar_thermal.o] Error 1
> > make: *** [drivers/thermal/rcar_thermal.o] Error 2
> >
> > with gcc version 4.6.3 (Ubuntu/Linaro 4.6.3-1ubuntu5)
> >
> > Signed-off-by: Devendra Naga <[email protected]>
> > ---
> > drivers/thermal/rcar_thermal.c | 2 +-
> > 1 file changed, 1 insertion(+), 1 deletion(-)
> >
> > diff --git a/drivers/thermal/rcar_thermal.c
> > b/drivers/thermal/rcar_thermal.c index d445271..f7a1b57 100644
> > --- a/drivers/thermal/rcar_thermal.c
> > +++ b/drivers/thermal/rcar_thermal.c
> > @@ -210,7 +210,7 @@ static int rcar_thermal_probe(struct
> platform_device *pdev)
> > goto error_free_priv;
> > }
> >
> > - zone = thermal_zone_device_register("rcar_thermal", 0, priv,
> > + 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");
> > --
> > 1.7.9.5
> >
>
>
> Best regards
> ---
> Kuninori Morimoto
From: Devendra Naga <[email protected]>
following were the errors reported
drivers/thermal/rcar_thermal.c: In function $B!F(Brcar_thermal_probe$B!G(B:
drivers/thermal/rcar_thermal.c:214:10: warning: passing argument 3 of $B!F(Bthermal_zone_device_register$B!G(B makes integer from pointer without a cast [enabled by default]
include/linux/thermal.h:166:29: note: expected $B!F(Bint$B!G(B but argument is of type $B!F(Bstruct rcar_thermal_priv *$B!G(B
drivers/thermal/rcar_thermal.c:214:10: error: too few arguments to function $B!F(Bthermal_zone_device_register$B!G(B
include/linux/thermal.h:166:29: note: declared here
make[1]: *** [drivers/thermal/rcar_thermal.o] Error 1
make: *** [drivers/thermal/rcar_thermal.o] Error 2
with gcc version 4.6.3 (Ubuntu/Linaro 4.6.3-1ubuntu5)
Signed-off-by: Devendra Naga <[email protected]>
---
Hi Zhang
This is original patch.
Please check Author's name after "git am"
drivers/thermal/rcar_thermal.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/thermal/rcar_thermal.c b/drivers/thermal/rcar_thermal.c
index d445271..f7a1b57 100644
--- a/drivers/thermal/rcar_thermal.c
+++ b/drivers/thermal/rcar_thermal.c
@@ -210,7 +210,7 @@ static int rcar_thermal_probe(struct platform_device *pdev)
goto error_free_priv;
}
- zone = thermal_zone_device_register("rcar_thermal", 0, priv,
+ 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");
--
1.7.9.5
Hi, Andrew,
Can you take this patch?
It fixes a real build error, and IMO, we should merge it ASAP. Thanks.
> -----Original Message-----
> From: kuninori morimoto [mailto:[email protected]] On
> Behalf Of Kuninori Morimoto
> Sent: Wednesday, October 31, 2012 4:46 PM
> To: Zhang, Rui
> Cc: Andrew Morton; [email protected]; Wu, Fengguang;
> Devendra Naga
> Subject: [PATCH] thermal: solve compilation errors in rcar_thermal
> Importance: High
>
> From: Devendra Naga <[email protected]>
>
> following were the errors reported
>
> drivers/thermal/rcar_thermal.c: In function 'rcar_thermal_probe':
> drivers/thermal/rcar_thermal.c:214:10: warning: passing argument 3 of
> 'thermal_zone_device_register' makes integer from pointer without a
> cast [enabled by default]
> include/linux/thermal.h:166:29: note: expected 'int' but argument is of
> type 'struct rcar_thermal_priv *'
> drivers/thermal/rcar_thermal.c:214:10: error: too few arguments to
> function 'thermal_zone_device_register'
> include/linux/thermal.h:166:29: note: declared here
> make[1]: *** [drivers/thermal/rcar_thermal.o] Error 1
> make: *** [drivers/thermal/rcar_thermal.o] Error 2
>
> with gcc version 4.6.3 (Ubuntu/Linaro 4.6.3-1ubuntu5)
>
> Signed-off-by: Devendra Naga <[email protected]>
Acked-by: Zhang Rui <[email protected]>
Thanks,
rui
> ---
> Hi Zhang
>
> This is original patch.
> Please check Author's name after "git am"
>
> drivers/thermal/rcar_thermal.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/thermal/rcar_thermal.c
> b/drivers/thermal/rcar_thermal.c index d445271..f7a1b57 100644
> --- a/drivers/thermal/rcar_thermal.c
> +++ b/drivers/thermal/rcar_thermal.c
> @@ -210,7 +210,7 @@ static int rcar_thermal_probe(struct
> platform_device *pdev)
> goto error_free_priv;
> }
>
> - zone = thermal_zone_device_register("rcar_thermal", 0, priv,
> + 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");
> --
> 1.7.9.5
On Tue, Oct 30, 2012 at 08:21:09PM -0700, Kuninori Morimoto wrote:
>
> Hi Zhang, Andrew
>
> This patch is needed on latest linus/master branch.
> Please re-check this patch.
Rui, it'd be better to send Andrew a finalized patch with your
Acked-by or Signed-off-by (because you passed it on), after resolving
the below puzzle:
> And, similar patch was added on linux-next/master branch
> b5da4e6d5603633835a1da267e0e699eea66f317
> (Thermal: Pass zone parameters as argument to tzd_register)
> but it seems wrong (?)
Thanks,
Fengguang
> At Tue, 21 Aug 2012 22:01:36 +0530,
> Devendra Naga wrote:
> >
> > following were the errors reported
> >
> > drivers/thermal/rcar_thermal.c: In function ‘rcar_thermal_probe’:
> > drivers/thermal/rcar_thermal.c:214:10: warning: passing argument 3 of ‘thermal_zone_device_register’ makes integer from pointer without a cast [enabled by default]
> > include/linux/thermal.h:166:29: note: expected ‘int’ but argument is of type ‘struct rcar_thermal_priv *’
> > drivers/thermal/rcar_thermal.c:214:10: error: too few arguments to function ‘thermal_zone_device_register’
> > include/linux/thermal.h:166:29: note: declared here
> > make[1]: *** [drivers/thermal/rcar_thermal.o] Error 1
> > make: *** [drivers/thermal/rcar_thermal.o] Error 2
> >
> > with gcc version 4.6.3 (Ubuntu/Linaro 4.6.3-1ubuntu5)
> >
> > Signed-off-by: Devendra Naga <[email protected]>
> > ---
> > drivers/thermal/rcar_thermal.c | 2 +-
> > 1 file changed, 1 insertion(+), 1 deletion(-)
> >
> > diff --git a/drivers/thermal/rcar_thermal.c b/drivers/thermal/rcar_thermal.c
> > index d445271..f7a1b57 100644
> > --- a/drivers/thermal/rcar_thermal.c
> > +++ b/drivers/thermal/rcar_thermal.c
> > @@ -210,7 +210,7 @@ static int rcar_thermal_probe(struct platform_device *pdev)
> > goto error_free_priv;
> > }
> >
> > - zone = thermal_zone_device_register("rcar_thermal", 0, priv,
> > + 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");
> > --
> > 1.7.9.5
> >
>
>
> Best regards
> ---
> Kuninori Morimoto
On Tue, 2012-10-02 at 23:51 -0700, Kuninori Morimoto wrote:
> devm_kfree and devm_iounmap should not have to be explicitly used
>
> Signed-off-by: Kuninori Morimoto <[email protected]>
applied to thermal-next.
thanks,
rui
> ---
> This patch is based on Devendra's
> [PATCH] thermal: solve compilation errors in rcar_thermal
>
> drivers/thermal/rcar_thermal.c | 18 ++----------------
> 1 file changed, 2 insertions(+), 16 deletions(-)
>
> diff --git a/drivers/thermal/rcar_thermal.c b/drivers/thermal/rcar_thermal.c
> index 762f637..81dce23 100644
> --- a/drivers/thermal/rcar_thermal.c
> +++ b/drivers/thermal/rcar_thermal.c
> @@ -185,7 +185,6 @@ static int rcar_thermal_probe(struct platform_device *pdev)
> struct thermal_zone_device *zone;
> struct rcar_thermal_priv *priv;
> struct resource *res;
> - int ret;
>
> res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
> if (!res) {
> @@ -206,16 +205,14 @@ static int rcar_thermal_probe(struct platform_device *pdev)
> res->start, resource_size(res));
> if (!priv->base) {
> dev_err(&pdev->dev, "Unable to ioremap thermal register\n");
> - ret = -ENOMEM;
> - goto error_free_priv;
> + return -ENOMEM;
> }
>
> zone = thermal_zone_device_register("rcar_thermal", 0, 0, priv,
> &rcar_thermal_zone_ops, NULL, 0, 0);
> if (IS_ERR(zone)) {
> dev_err(&pdev->dev, "thermal zone device is NULL\n");
> - ret = PTR_ERR(zone);
> - goto error_iounmap;
> + return PTR_ERR(zone);
> }
>
> platform_set_drvdata(pdev, zone);
> @@ -223,26 +220,15 @@ static int rcar_thermal_probe(struct platform_device *pdev)
> dev_info(&pdev->dev, "proved\n");
>
> return 0;
> -
> -error_iounmap:
> - devm_iounmap(&pdev->dev, priv->base);
> -error_free_priv:
> - devm_kfree(&pdev->dev, priv);
> -
> - return ret;
> }
>
> static int rcar_thermal_remove(struct platform_device *pdev)
> {
> struct thermal_zone_device *zone = platform_get_drvdata(pdev);
> - struct rcar_thermal_priv *priv = zone->devdata;
>
> thermal_zone_device_unregister(zone);
> platform_set_drvdata(pdev, NULL);
>
> - devm_iounmap(&pdev->dev, priv->base);
> - devm_kfree(&pdev->dev, priv);
> -
> return 0;
> }
>
On Tue, 2012-10-09 at 01:14 -0700, Kuninori Morimoto wrote:
> This patch fixup following error
>
> ${LINUX}/drivers/thermal/rcar_thermal.c: In function 'rcar_thermal_probe':
> ${LINUX}/drivers/thermal/rcar_thermal.c:214:9: warning: passing argument 3 \
> of 'thermal_zone_device_register' makes integer from pointer without\
> a cast [enabled by default]
> ${LINUX}/include/linux/thermal.h:215:29: note: expected 'int' but argument \
> is of type 'struct rcar_thermal_priv *'
> ${LINUX}/drivers/thermal/rcar_thermal.c:214:9:\
> error: too few arguments to function 'thermal_zone_device_register'
>
> Signed-off-by: Devendra Naga <[email protected]>
> Signed-off-by: Kuninori Morimoto <[email protected]>
shipped in 3.7-rc4.
thanks,
rui
> ---
> for linus/master branch
>
> drivers/thermal/rcar_thermal.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/thermal/rcar_thermal.c b/drivers/thermal/rcar_thermal.c
> index b13fe5d..762f637 100644
> --- a/drivers/thermal/rcar_thermal.c
> +++ b/drivers/thermal/rcar_thermal.c
> @@ -210,7 +210,7 @@ static int rcar_thermal_probe(struct platform_device *pdev)
> goto error_free_priv;
> }
>
> - zone = thermal_zone_device_register("rcar_thermal", 0, priv,
> + zone = thermal_zone_device_register("rcar_thermal", 0, 0, priv,
> &rcar_thermal_zone_ops, NULL, 0, 0);
> if (IS_ERR(zone)) {
> dev_err(&pdev->dev, "thermal zone device is NULL\n");