| Message ID | 1423234546-10458-1-git-send-email-grygorii.strashko@linaro.org |
|---|---|
| State | New |
| Headers | show |
Hi Rui, On 02/09/2015 05:01 PM, Nishanth Menon wrote: > On 16:55-20150206, grygorii.strashko@linaro.org wrote: >> From: Grygorii Strashko <Grygorii.Strashko@linaro.org> >> >> Fix following build warning if CONFIG_PM_SLEEP is not set: >> >> drivers/thermal/ti-soc-thermal/ti-bandgap.c:1478:12: warning: 'ti_bandgap_suspend' defined but not used [-Wunused-function] >> static int ti_bandgap_suspend(struct device *dev) >> ^ >> drivers/thermal/ti-soc-thermal/ti-bandgap.c:1492:12: warning: 'ti_bandgap_resume' defined but not used [-Wunused-function] >> static int ti_bandgap_resume(struct device *dev) >> ^ >> Signed-off-by: Grygorii Strashko <Grygorii.Strashko@linaro.org> >> --- >> drivers/thermal/ti-soc-thermal/ti-bandgap.c | 2 +- >> 1 file changed, 1 insertion(+), 1 deletion(-) >> >> diff --git a/drivers/thermal/ti-soc-thermal/ti-bandgap.c b/drivers/thermal/ti-soc-thermal/ti-bandgap.c >> index 74c0e34..5d46660 100644 >> --- a/drivers/thermal/ti-soc-thermal/ti-bandgap.c >> +++ b/drivers/thermal/ti-soc-thermal/ti-bandgap.c >> @@ -1402,7 +1402,7 @@ int ti_bandgap_remove(struct platform_device *pdev) >> return 0; >> } >> >> -#ifdef CONFIG_PM >> +#ifdef CONFIG_PM_SLEEP >> static int ti_bandgap_save_ctxt(struct ti_bandgap *bgp) >> { >> int i; >> -- >> 1.9.1 >> > > Suggest aligning with Paul as well: > https://patchwork.kernel.org/patch/5795391/ ^Paul Walmsley wrote: Oh, nothing to be confused by, I just missed the earlier patch. I withdraw mine. > > Otherwise: > Acked-by: Nishanth Menon <nm@ti.com> > It looks like this patch is missed in 4.0-rc1, so could it be merged during rc cycle or you'd like me to resend it? (I've rechecked - it can be applied on top of Linux 4.0-rc1 without any issues)
On 24 February 2015 at 20:03, Eduardo Valentin <edubezval@gmail.com> wrote: > On Tue, Feb 24, 2015 at 06:01:23PM +0200, Grygorii.Strashko@linaro.org wrote: >> On 02/09/2015 05:01 PM, Nishanth Menon wrote: >> > On 16:55-20150206, grygorii.strashko@linaro.org wrote: >> >> From: Grygorii Strashko <Grygorii.Strashko@linaro.org> >> >> >> >> Fix following build warning if CONFIG_PM_SLEEP is not set: >> >> >> >> drivers/thermal/ti-soc-thermal/ti-bandgap.c:1478:12: warning: 'ti_bandgap_suspend' defined but not used [-Wunused-function] >> >> static int ti_bandgap_suspend(struct device *dev) >> >> ^ >> > >> > Suggest aligning with Paul as well: >> > https://patchwork.kernel.org/patch/5795391/ >> >> ^Paul Walmsley wrote: Oh, nothing to be confused by, I just missed the >> earlier patch. I withdraw mine. >> >> > >> > Otherwise: >> > Acked-by: Nishanth Menon <nm@ti.com> >> > >> >> It looks like this patch is missed in 4.0-rc1, so could it be merged >> during rc cycle or you'd like me to resend it? >> (I've rechecked - it can be applied on top of Linux 4.0-rc1 without any issues) > > > No need to resend. I will add to my -fixes queue. > Thanks.
diff --git a/drivers/thermal/ti-soc-thermal/ti-bandgap.c b/drivers/thermal/ti-soc-thermal/ti-bandgap.c index 74c0e34..5d46660 100644 --- a/drivers/thermal/ti-soc-thermal/ti-bandgap.c +++ b/drivers/thermal/ti-soc-thermal/ti-bandgap.c @@ -1402,7 +1402,7 @@ int ti_bandgap_remove(struct platform_device *pdev) return 0; } -#ifdef CONFIG_PM +#ifdef CONFIG_PM_SLEEP static int ti_bandgap_save_ctxt(struct ti_bandgap *bgp) { int i;