[rafael-pm:bleeding-edge 48/94] drivers/thermal/amlogic_thermal.c:303:16: error: void value not ignored as it ought to be

[rafael-pm:bleeding-edge 48/94] drivers/thermal/amlogic_thermal.c:303:16: error: void value not ignored as it ought to be

[kernel test robot]

tree:   https://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm.git bleeding-edge
head:   2cff74feed4a2a3a1c220e0ee2838b85b08d4999
commit: 88af8b66ffedcad8c5a1522f6a9c02bf8129a951 [48/94] thermal: amlogic: Convert to platform remove callback returning void
config: arm-randconfig-004-20230929 (https://download.01.org/0day-ci/archive/20230929/202309291214.Hjn3gJ94-lkp@intel.com/config)
compiler: arm-linux-gnueabi-gcc (GCC) 13.2.0
reproduce (this is a W=1 build): (https://download.01.org/0day-ci/archive/20230929/202309291214.Hjn3gJ94-lkp@intel.com/reproduce)

If you fix the issue in a separate patch/commit (i.e. not just a new version of
the same patch/commit), kindly add following tags
| Reported-by: kernel test robot <lkp@intel.com>
| Closes: https://lore.kernel.org/oe-kbuild-all/202309291214.Hjn3gJ94-lkp@intel.com/

All errors (new ones prefixed by >>):

   drivers/thermal/amlogic_thermal.c: In function 'amlogic_thermal_suspend':
>> drivers/thermal/amlogic_thermal.c:303:16: error: void value not ignored as it ought to be
     303 |         return amlogic_thermal_disable(data);
         |                ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~


vim +303 drivers/thermal/amlogic_thermal.c

421eda108e6c63a Guillaume La Roque 2019-10-04  298  
421eda108e6c63a Guillaume La Roque 2019-10-04  299  static int __maybe_unused amlogic_thermal_suspend(struct device *dev)
421eda108e6c63a Guillaume La Roque 2019-10-04  300  {
421eda108e6c63a Guillaume La Roque 2019-10-04  301  	struct amlogic_thermal *data = dev_get_drvdata(dev);
421eda108e6c63a Guillaume La Roque 2019-10-04  302  
421eda108e6c63a Guillaume La Roque 2019-10-04 @303  	return amlogic_thermal_disable(data);
421eda108e6c63a Guillaume La Roque 2019-10-04  304  }
421eda108e6c63a Guillaume La Roque 2019-10-04  305  

:::::: The code at line 303 was first introduced by commit
:::::: 421eda108e6c63a72feb178c441bb769d4076836 thermal: amlogic: Add thermal driver to support G12 SoCs

:::::: TO: Guillaume La Roque <glaroque@baylibre.com>
:::::: CC: Daniel Lezcano <daniel.lezcano@linaro.org>

-- 
0-DAY CI Kernel Test Service
https://github.com/intel/lkp-tests/wiki

Re: [rafael-pm:bleeding-edge 48/94] drivers/thermal/amlogic_thermal.c:303:16: error: void value not ignored as it ought to be

[Rafael J. Wysocki]

On Fri, Sep 29, 2023 at 6:21 AM kernel test robot <lkp@intel.com> wrote:
>
> tree:   https://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm.git bleeding-edge
> head:   2cff74feed4a2a3a1c220e0ee2838b85b08d4999
> commit: 88af8b66ffedcad8c5a1522f6a9c02bf8129a951 [48/94] thermal: amlogic: Convert to platform remove callback returning void
> config: arm-randconfig-004-20230929 (https://download.01.org/0day-ci/archive/20230929/202309291214.Hjn3gJ94-lkp@intel.com/config)
> compiler: arm-linux-gnueabi-gcc (GCC) 13.2.0
> reproduce (this is a W=1 build): (https://download.01.org/0day-ci/archive/20230929/202309291214.Hjn3gJ94-lkp@intel.com/reproduce)
>
> If you fix the issue in a separate patch/commit (i.e. not just a new version of
> the same patch/commit), kindly add following tags
> | Reported-by: kernel test robot <lkp@intel.com>
> | Closes: https://lore.kernel.org/oe-kbuild-all/202309291214.Hjn3gJ94-lkp@intel.com/
>
> All errors (new ones prefixed by >>):
>
>    drivers/thermal/amlogic_thermal.c: In function 'amlogic_thermal_suspend':
> >> drivers/thermal/amlogic_thermal.c:303:16: error: void value not ignored as it ought to be
>      303 |         return amlogic_thermal_disable(data);
>          |                ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~

amlogic_thermal_disable() should not be modified by this commit -
fixed up in the tree.

Thanks!

>
> vim +303 drivers/thermal/amlogic_thermal.c
>
> 421eda108e6c63a Guillaume La Roque 2019-10-04  298
> 421eda108e6c63a Guillaume La Roque 2019-10-04  299  static int __maybe_unused amlogic_thermal_suspend(struct device *dev)
> 421eda108e6c63a Guillaume La Roque 2019-10-04  300  {
> 421eda108e6c63a Guillaume La Roque 2019-10-04  301      struct amlogic_thermal *data = dev_get_drvdata(dev);
> 421eda108e6c63a Guillaume La Roque 2019-10-04  302
> 421eda108e6c63a Guillaume La Roque 2019-10-04 @303      return amlogic_thermal_disable(data);
> 421eda108e6c63a Guillaume La Roque 2019-10-04  304  }
> 421eda108e6c63a Guillaume La Roque 2019-10-04  305
>
> :::::: The code at line 303 was first introduced by commit
> :::::: 421eda108e6c63a72feb178c441bb769d4076836 thermal: amlogic: Add thermal driver to support G12 SoCs
>
> :::::: TO: Guillaume La Roque <glaroque@baylibre.com>
> :::::: CC: Daniel Lezcano <daniel.lezcano@linaro.org>
>
> --
> 0-DAY CI Kernel Test Service
> https://github.com/intel/lkp-tests/wiki

Re: [rafael-pm:bleeding-edge 48/94] drivers/thermal/amlogic_thermal.c:303:16: error: void value not ignored as it ought to be

[Uwe Kleine-König]

[-- Attachment #1: Type: text/plain, Size: 3083 bytes --]

On Fri, Sep 29, 2023 at 12:37:03PM +0200, Rafael J. Wysocki wrote:
> On Fri, Sep 29, 2023 at 6:21 AM kernel test robot <lkp@intel.com> wrote:
> >
> > tree:   https://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm.git bleeding-edge
> > head:   2cff74feed4a2a3a1c220e0ee2838b85b08d4999
> > commit: 88af8b66ffedcad8c5a1522f6a9c02bf8129a951 [48/94] thermal: amlogic: Convert to platform remove callback returning void
> > config: arm-randconfig-004-20230929 (https://download.01.org/0day-ci/archive/20230929/202309291214.Hjn3gJ94-lkp@intel.com/config)
> > compiler: arm-linux-gnueabi-gcc (GCC) 13.2.0
> > reproduce (this is a W=1 build): (https://download.01.org/0day-ci/archive/20230929/202309291214.Hjn3gJ94-lkp@intel.com/reproduce)
> >
> > If you fix the issue in a separate patch/commit (i.e. not just a new version of
> > the same patch/commit), kindly add following tags
> > | Reported-by: kernel test robot <lkp@intel.com>
> > | Closes: https://lore.kernel.org/oe-kbuild-all/202309291214.Hjn3gJ94-lkp@intel.com/
> >
> > All errors (new ones prefixed by >>):
> >
> >    drivers/thermal/amlogic_thermal.c: In function 'amlogic_thermal_suspend':
> > >> drivers/thermal/amlogic_thermal.c:303:16: error: void value not ignored as it ought to be
> >      303 |         return amlogic_thermal_disable(data);
> >          |                ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~
> 
> amlogic_thermal_disable() should not be modified by this commit -
> fixed up in the tree.

Thanks for choosing an option that hides that embarrassing build
failure. :-)

IMHO

https://lore.kernel.org/all/20230929061305.2351953-1-u.kleine-koenig@pengutronix.de

is the nicer fix because with that amlogic_thermal_remove() would ignore
the return value of amlogic_thermal_disable(). On top of your current
tree that would be:

diff --git a/drivers/thermal/amlogic_thermal.c b/drivers/thermal/amlogic_thermal.c
index 5877cde25b79..562f63b7bf27 100644
--- a/drivers/thermal/amlogic_thermal.c
+++ b/drivers/thermal/amlogic_thermal.c
@@ -167,13 +167,11 @@ static int amlogic_thermal_enable(struct amlogic_thermal *data)
 	return 0;
 }
 
-static int amlogic_thermal_disable(struct amlogic_thermal *data)
+static void amlogic_thermal_disable(struct amlogic_thermal *data)
 {
 	regmap_update_bits(data->regmap, TSENSOR_CFG_REG1,
 			   TSENSOR_CFG_REG1_ENABLE, 0);
 	clk_disable_unprepare(data->clk);
-
-	return 0;
 }
 
 static int amlogic_thermal_get_temp(struct thermal_zone_device *tz, int *temp)
@@ -302,7 +300,9 @@ static int __maybe_unused amlogic_thermal_suspend(struct device *dev)
 {
 	struct amlogic_thermal *data = dev_get_drvdata(dev);
 
-	return amlogic_thermal_disable(data);
+	amlogic_thermal_disable(data);
+
+	return 0;
 }
 
 static int __maybe_unused amlogic_thermal_resume(struct device *dev)

But I won't argue further and consider the case closed.

Thanks
Uwe

-- 
Pengutronix e.K.                           | Uwe Kleine-König            |
Industrial Linux Solutions                 | https://www.pengutronix.de/ |

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]