Re: [PATCH 4/5] kobject: kset_uevent_ops: make name() callback take a const *

[Rafael J. Wysocki]

On Mon, Nov 21, 2022 at 10:47 AM Greg Kroah-Hartman
<gregkh@xxxxxxxxxxxxxxxxxxx> wrote:
>
> The name() callback in struct kset_uevent_ops does not modify the
> kobject passed into it, so make the pointer const to enforce this
> restriction.  When doing so, fix up the single existing name() callback
> to have the correct signature to preserve the build.
>
> Cc: "Rafael J. Wysocki" <rafael@xxxxxxxxxx>
> Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>

Acked-by: Rafael J. Wysocki <rafael@xxxxxxxxxx>

> ---
>  drivers/base/core.c     | 4 ++--
>  include/linux/kobject.h | 2 +-
>  2 files changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/base/core.c b/drivers/base/core.c
> index 005a2b092f3e..a3e14143ec0c 100644
> --- a/drivers/base/core.c
> +++ b/drivers/base/core.c
> @@ -2376,9 +2376,9 @@ static int dev_uevent_filter(const struct kobject *kobj)
>         return 0;
>  }
>
> -static const char *dev_uevent_name(struct kobject *kobj)
> +static const char *dev_uevent_name(const struct kobject *kobj)
>  {
> -       struct device *dev = kobj_to_dev(kobj);
> +       const struct device *dev = kobj_to_dev(kobj);
>
>         if (dev->bus)
>                 return dev->bus->name;
> diff --git a/include/linux/kobject.h b/include/linux/kobject.h
> index 640f59d4b3de..58a5b75612e3 100644
> --- a/include/linux/kobject.h
> +++ b/include/linux/kobject.h
> @@ -136,7 +136,7 @@ struct kobj_uevent_env {
>
>  struct kset_uevent_ops {
>         int (* const filter)(const struct kobject *kobj);
> -       const char *(* const name)(struct kobject *kobj);
> +       const char *(* const name)(const struct kobject *kobj);
>         int (* const uevent)(struct kobject *kobj, struct kobj_uevent_env *env);
>  };
>
> --
> 2.38.1
>