Re: [PATCH v2 3/5] thermal: core: Remove old uapi generic netlink

[Amit Kucheria]

On Thu, Jun 25, 2020 at 8:15 PM Daniel Lezcano
<daniel.lezcano@xxxxxxxxxx> wrote:
>
> In order to set the scene for the new generic netlink thermal
> management and notifications, let remove the old dead code remaining

s/management/management api/

s/let/let's/

> in the uapi headers.
>
> Signed-off-by: Daniel Lezcano <daniel.lezcano@xxxxxxxxxx>
> ---
>  include/linux/thermal.h      |  5 -----
>  include/uapi/linux/thermal.h | 12 +-----------
>  2 files changed, 1 insertion(+), 16 deletions(-)
>
> diff --git a/include/linux/thermal.h b/include/linux/thermal.h
> index faf7ad031e42..fc93a6348082 100644
> --- a/include/linux/thermal.h
> +++ b/include/linux/thermal.h
> @@ -302,11 +302,6 @@ struct thermal_zone_params {
>         int offset;
>  };
>
> -struct thermal_genl_event {
> -       u32 orig;
> -       enum events event;
> -};
> -
>  /**
>   * struct thermal_zone_of_device_ops - scallbacks for handling DT based zones
>   *
> diff --git a/include/uapi/linux/thermal.h b/include/uapi/linux/thermal.h
> index 96218378dda8..22df67ed9e9c 100644
> --- a/include/uapi/linux/thermal.h
> +++ b/include/uapi/linux/thermal.h
> @@ -6,21 +6,12 @@
>
>  /* Adding event notification support elements */
>  #define THERMAL_GENL_FAMILY_NAME                "thermal_event"
> -#define THERMAL_GENL_VERSION                    0x01
> +#define THERMAL_GENL_VERSION                    0x02

This hunk should be removed since you set version back to 1 in the
next patch and we don't actually intend to bump the version yet.


>  #define THERMAL_GENL_MCAST_GROUP_NAME           "thermal_mc_grp"
>
> -/* Events supported by Thermal Netlink */
> -enum events {
> -       THERMAL_AUX0,
> -       THERMAL_AUX1,
> -       THERMAL_CRITICAL,
> -       THERMAL_DEV_FAULT,
> -};
> -
>  /* attributes of thermal_genl_family */
>  enum {
>         THERMAL_GENL_ATTR_UNSPEC,
> -       THERMAL_GENL_ATTR_EVENT,
>         __THERMAL_GENL_ATTR_MAX,
>  };
>  #define THERMAL_GENL_ATTR_MAX (__THERMAL_GENL_ATTR_MAX - 1)
> @@ -28,7 +19,6 @@ enum {
>  /* commands supported by the thermal_genl_family */
>  enum {
>         THERMAL_GENL_CMD_UNSPEC,
> -       THERMAL_GENL_CMD_EVENT,
>         __THERMAL_GENL_CMD_MAX,
>  };
>  #define THERMAL_GENL_CMD_MAX (__THERMAL_GENL_CMD_MAX - 1)
> --
> 2.17.1
>