On Fri, 23 Feb 2024, Christophe JAILLET <christophe.jaillet@xxxxxxxxxx> wrote:
> 'name' may still be "intel_backlight" when backlight_device_register() is
> called.
> In such a case, using kstrdup_const() saves a memory duplication when
> dev_set_name() is called in backlight_device_register().
>
> Use kfree_const() accordingly.
>
> Signed-off-by: Christophe JAILLET <christophe.jaillet@xxxxxxxxxx>
Thanks, pushed to drm-intel-next.
BR,
Jani.
> ---
> Compile tested only
> ---
> drivers/gpu/drm/i915/display/intel_backlight.c | 6 +++---
> 1 file changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/display/intel_backlight.c b/drivers/gpu/drm/i915/display/intel_backlight.c
> index 1946d7fb3c2e..9e4a9d4f1585 100644
> --- a/drivers/gpu/drm/i915/display/intel_backlight.c
> +++ b/drivers/gpu/drm/i915/display/intel_backlight.c
> @@ -949,7 +949,7 @@ int intel_backlight_device_register(struct intel_connector *connector)
> else
> props.power = FB_BLANK_POWERDOWN;
>
> - name = kstrdup("intel_backlight", GFP_KERNEL);
> + name = kstrdup_const("intel_backlight", GFP_KERNEL);
> if (!name)
> return -ENOMEM;
>
> @@ -963,7 +963,7 @@ int intel_backlight_device_register(struct intel_connector *connector)
> * compatibility. Use unique names for subsequent backlight devices as a
> * fallback when the default name already exists.
> */
> - kfree(name);
> + kfree_const(name);
> name = kasprintf(GFP_KERNEL, "card%d-%s-backlight",
> i915->drm.primary->index, connector->base.name);
> if (!name)
> @@ -987,7 +987,7 @@ int intel_backlight_device_register(struct intel_connector *connector)
> connector->base.base.id, connector->base.name, name);
>
> out:
> - kfree(name);
> + kfree_const(name);
>
> return ret;
> }
--
Jani Nikula, Intel
