lkml.org 
[lkml]   [2022]   [Nov]   [21]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
From
Date
SubjectRe: [PATCH 4/5] kobject: kset_uevent_ops: make name() callback take a const *
On Mon, Nov 21, 2022 at 10:47 AM Greg Kroah-Hartman
<gregkh@linuxfoundation.org> 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@kernel.org>
> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

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

> ---
> 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
>

\
 
 \ /
  Last update: 2022-11-21 12:51    [W:0.174 / U:0.192 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site