| Message ID | 1369128041-23403-1-git-send-email-sachin.kamat@linaro.org (mailing list archive) |
|---|---|
| State | Accepted, archived |
| Delegated to: | Zhang Rui |
| Headers | show |
On 21 May 2013 14:50, Sachin Kamat <sachin.kamat@linaro.org> wrote: > Fixes the following compilation error introduced by commit 253e3ae170 > (Thermal: spear_thermal: convert to devm_ioremap_resource). > drivers/thermal/spear_thermal.c: In function ‘spear_thermal_probe’: > drivers/thermal/spear_thermal.c:123:46: error: ‘dev’ undeclared > (first use in this function) > stdev->thermal_base = devm_ioremap_resource(dev, res); > > While at it also remove the error message as devm_ioremap_resource() > provides its own error messages. > > Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org> > Cc: Vincenzo Frascino <vincenzo.frascino@st.com> > Cc: Viresh Kumar <viresh.kumar@linaro.org> > --- > Compile tested and based on linux-next (20130521). > --- > drivers/thermal/spear_thermal.c | 6 ++---- > 1 file changed, 2 insertions(+), 4 deletions(-) Acked-by: Viresh Kumar <viresh.kumar@linaro.org> -- To unsubscribe from this list: send the line "unsubscribe linux-pm" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On 21-05-2013 05:20, Sachin Kamat wrote: > Fixes the following compilation error introduced by commit 253e3ae170 > (Thermal: spear_thermal: convert to devm_ioremap_resource). > drivers/thermal/spear_thermal.c: In function ‘spear_thermal_probe’: > drivers/thermal/spear_thermal.c:123:46: error: ‘dev’ undeclared > (first use in this function) > stdev->thermal_base = devm_ioremap_resource(dev, res); > > While at it also remove the error message as devm_ioremap_resource() > provides its own error messages. > > Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org> > Cc: Vincenzo Frascino <vincenzo.frascino@st.com> > Cc: Viresh Kumar <viresh.kumar@linaro.org> Acked-by: Eduardo Valentin <eduardo.valentin@ti.com> > --- > Compile tested and based on linux-next (20130521). Also compiled tested on same linux-next. Tested-by: Eduardo Valentin <eduardo.valentin@ti.com> > --- > drivers/thermal/spear_thermal.c | 6 ++---- > 1 file changed, 2 insertions(+), 4 deletions(-) > > diff --git a/drivers/thermal/spear_thermal.c b/drivers/thermal/spear_thermal.c > index fa30918..813add6 100644 > --- a/drivers/thermal/spear_thermal.c > +++ b/drivers/thermal/spear_thermal.c > @@ -120,11 +120,9 @@ static int spear_thermal_probe(struct platform_device *pdev) > > /* Enable thermal sensor */ > res = platform_get_resource(pdev, IORESOURCE_MEM, 0); > - stdev->thermal_base = devm_ioremap_resource(dev, res); > - if (IS_ERR(stdev->thermal_base)) { > - dev_err(&pdev->dev, "ioremap failed\n"); > + stdev->thermal_base = devm_ioremap_resource(&pdev->dev, res); > + if (IS_ERR(stdev->thermal_base)) > return PTR_ERR(stdev->thermal_base); > - } > > stdev->clk = devm_clk_get(&pdev->dev, NULL); > if (IS_ERR(stdev->clk)) { >
On Thu, 2013-05-23 at 11:10 -0400, Eduardo Valentin wrote: > On 21-05-2013 05:20, Sachin Kamat wrote: > > Fixes the following compilation error introduced by commit 253e3ae170 > > (Thermal: spear_thermal: convert to devm_ioremap_resource). As this commit has not been in upstream yet. I'll merge these two patches together, instead of two separate patches. Refreshed patch applied in thermal -next. thanks, rui > > drivers/thermal/spear_thermal.c: In function ‘spear_thermal_probe’: > > drivers/thermal/spear_thermal.c:123:46: error: ‘dev’ undeclared > > (first use in this function) > > stdev->thermal_base = devm_ioremap_resource(dev, res); > > > > While at it also remove the error message as devm_ioremap_resource() > > provides its own error messages. > > > > Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org> > > Cc: Vincenzo Frascino <vincenzo.frascino@st.com> > > Cc: Viresh Kumar <viresh.kumar@linaro.org> > > Acked-by: Eduardo Valentin <eduardo.valentin@ti.com> > > > --- > > Compile tested and based on linux-next (20130521). > > Also compiled tested on same linux-next. > > Tested-by: Eduardo Valentin <eduardo.valentin@ti.com> > > --- > > drivers/thermal/spear_thermal.c | 6 ++---- > > 1 file changed, 2 insertions(+), 4 deletions(-) > > > > diff --git a/drivers/thermal/spear_thermal.c b/drivers/thermal/spear_thermal.c > > index fa30918..813add6 100644 > > --- a/drivers/thermal/spear_thermal.c > > +++ b/drivers/thermal/spear_thermal.c > > @@ -120,11 +120,9 @@ static int spear_thermal_probe(struct platform_device *pdev) > > > > /* Enable thermal sensor */ > > res = platform_get_resource(pdev, IORESOURCE_MEM, 0); > > - stdev->thermal_base = devm_ioremap_resource(dev, res); > > - if (IS_ERR(stdev->thermal_base)) { > > - dev_err(&pdev->dev, "ioremap failed\n"); > > + stdev->thermal_base = devm_ioremap_resource(&pdev->dev, res); > > + if (IS_ERR(stdev->thermal_base)) > > return PTR_ERR(stdev->thermal_base); > > - } > > > > stdev->clk = devm_clk_get(&pdev->dev, NULL); > > if (IS_ERR(stdev->clk)) { > > > > -- To unsubscribe from this list: send the line "unsubscribe linux-pm" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/thermal/spear_thermal.c b/drivers/thermal/spear_thermal.c index fa30918..813add6 100644 --- a/drivers/thermal/spear_thermal.c +++ b/drivers/thermal/spear_thermal.c @@ -120,11 +120,9 @@ static int spear_thermal_probe(struct platform_device *pdev) /* Enable thermal sensor */ res = platform_get_resource(pdev, IORESOURCE_MEM, 0); - stdev->thermal_base = devm_ioremap_resource(dev, res); - if (IS_ERR(stdev->thermal_base)) { - dev_err(&pdev->dev, "ioremap failed\n"); + stdev->thermal_base = devm_ioremap_resource(&pdev->dev, res); + if (IS_ERR(stdev->thermal_base)) return PTR_ERR(stdev->thermal_base); - } stdev->clk = devm_clk_get(&pdev->dev, NULL); if (IS_ERR(stdev->clk)) {
Fixes the following compilation error introduced by commit 253e3ae170 (Thermal: spear_thermal: convert to devm_ioremap_resource). drivers/thermal/spear_thermal.c: In function ‘spear_thermal_probe’: drivers/thermal/spear_thermal.c:123:46: error: ‘dev’ undeclared (first use in this function) stdev->thermal_base = devm_ioremap_resource(dev, res); While at it also remove the error message as devm_ioremap_resource() provides its own error messages. Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org> Cc: Vincenzo Frascino <vincenzo.frascino@st.com> Cc: Viresh Kumar <viresh.kumar@linaro.org> --- Compile tested and based on linux-next (20130521). --- drivers/thermal/spear_thermal.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)