diff mbox series

thermal/core: Check get_temp ops is present when registering a tz

Message ID 20231213121322.2486967-1-daniel.lezcano@linaro.org
State New
Headers
Series thermal/core: Check get_temp ops is present when registering a tz |

Commit Message

Daniel Lezcano Dec. 13, 2023, 12:13 p.m. UTC 
  Initially the check against the get_temp ops in the
thermal_zone_device_update() was put in there in order to catch
drivers not providing this method.

Instead of checking again and again the function if the ops exists in
the update function, let's do the check at registration time, so it is
checked one time and for all.

Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org>
---
 drivers/thermal/thermal_core.c | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

Comments

Rafael J. Wysocki Dec. 13, 2023, 12:46 p.m. UTC | #1 
On Wed, Dec 13, 2023 at 1:13 PM Daniel Lezcano
<daniel.lezcano@linaro.org> wrote:
>
> Initially the check against the get_temp ops in the
> thermal_zone_device_update() was put in there in order to catch
> drivers not providing this method.
>
> Instead of checking again and again the function if the ops exists in
> the update function, let's do the check at registration time, so it is
> checked one time and for all.
>
> Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org>

Looks good.  Do you want me to pick it up?

> ---
>  drivers/thermal/thermal_core.c | 7 +------
>  1 file changed, 1 insertion(+), 6 deletions(-)
>
> diff --git a/drivers/thermal/thermal_core.c b/drivers/thermal/thermal_core.c
> index 625ba07cbe2f..964f26e517f4 100644
> --- a/drivers/thermal/thermal_core.c
> +++ b/drivers/thermal/thermal_core.c
> @@ -437,11 +437,6 @@ void __thermal_zone_device_update(struct thermal_zone_device *tz,
>         if (atomic_read(&in_suspend))
>                 return;
>
> -       if (WARN_ONCE(!tz->ops->get_temp,
> -                     "'%s' must not be called without 'get_temp' ops set\n",
> -                     __func__))
> -               return;
> -
>         if (!thermal_zone_device_is_enabled(tz))
>                 return;
>
> @@ -1289,7 +1284,7 @@ thermal_zone_device_register_with_trips(const char *type, struct thermal_trip *t
>                 return ERR_PTR(-EINVAL);
>         }
>
> -       if (!ops) {
> +       if (!ops || !ops->get_temp) {
>                 pr_err("Thermal zone device ops not defined\n");
>                 return ERR_PTR(-EINVAL);
>         }
> --
> 2.34.1
>
Daniel Lezcano Dec. 13, 2023, 1:31 p.m. UTC | #2 
On 13/12/2023 13:46, Rafael J. Wysocki wrote:
> On Wed, Dec 13, 2023 at 1:13 PM Daniel Lezcano
> <daniel.lezcano@linaro.org> wrote:
>>
>> Initially the check against the get_temp ops in the
>> thermal_zone_device_update() was put in there in order to catch
>> drivers not providing this method.
>>
>> Instead of checking again and again the function if the ops exists in
>> the update function, let's do the check at registration time, so it is
>> checked one time and for all.
>>
>> Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org>
> 
> Looks good.  Do you want me to pick it up?

Yes please

Thanks
Rafael J. Wysocki Dec. 13, 2023, 1:37 p.m. UTC | #3 
On Wed, Dec 13, 2023 at 2:31 PM Daniel Lezcano
<daniel.lezcano@linaro.org> wrote:
>
> On 13/12/2023 13:46, Rafael J. Wysocki wrote:
> > On Wed, Dec 13, 2023 at 1:13 PM Daniel Lezcano
> > <daniel.lezcano@linaro.org> wrote:
> >>
> >> Initially the check against the get_temp ops in the
> >> thermal_zone_device_update() was put in there in order to catch
> >> drivers not providing this method.
> >>
> >> Instead of checking again and again the function if the ops exists in
> >> the update function, let's do the check at registration time, so it is
> >> checked one time and for all.
> >>
> >> Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org>
> >
> > Looks good.  Do you want me to pick it up?
>
> Yes please

Applied, thanks!
diff mbox series

Patch

diff --git a/drivers/thermal/thermal_core.c b/drivers/thermal/thermal_core.c
index 625ba07cbe2f..964f26e517f4 100644
--- a/drivers/thermal/thermal_core.c
+++ b/drivers/thermal/thermal_core.c
@@ -437,11 +437,6 @@  void __thermal_zone_device_update(struct thermal_zone_device *tz,
 	if (atomic_read(&in_suspend))
 		return;
 
-	if (WARN_ONCE(!tz->ops->get_temp,
-		      "'%s' must not be called without 'get_temp' ops set\n",
-		      __func__))
-		return;
-
 	if (!thermal_zone_device_is_enabled(tz))
 		return;
 
@@ -1289,7 +1284,7 @@  thermal_zone_device_register_with_trips(const char *type, struct thermal_trip *t
 		return ERR_PTR(-EINVAL);
 	}
 
-	if (!ops) {
+	if (!ops || !ops->get_temp) {
 		pr_err("Thermal zone device ops not defined\n");
 		return ERR_PTR(-EINVAL);
 	}