Re: [PATCH 1/3] hp-wmi: refactor to use __free

["Ilpo Järvinen" <ilpo.jarvinen@linux.intel.com>]

On Sun, 12 Jul 2026, yahia wrote:

> From: yahia ahmed <yahia.a.abdrabou@gmail.com>
> 
> hp_wmi_query_perform currently() uses the out_free label to exit the
> function and free the memory, but doesn't use the __free cleanup

__free()

More generally, please include () into names which are directly 
referencing a C function name, macro, etc. that have parenthesis in their 
name in C as well.

> attribute to simply the processes of exiting and freeing memory.
> 
> Signed-off-by: yahia ahmed <yahia.a.abdrabou@gmail.com>
> ---
>  drivers/platform/x86/hp/hp-wmi.c | 20 +++++++-------------
>  1 file changed, 7 insertions(+), 13 deletions(-)
> 
> diff --git a/drivers/platform/x86/hp/hp-wmi.c b/drivers/platform/x86/hp/hp-wmi.c
> index 8ba286ed8721..c924fbb5503f 100644
> --- a/drivers/platform/x86/hp/hp-wmi.c
> +++ b/drivers/platform/x86/hp/hp-wmi.c
> @@ -581,8 +581,8 @@ static int hp_wmi_perform_query(int query, enum hp_wmi_command command,
>  {
>  	struct acpi_buffer input, output = { ACPI_ALLOCATE_BUFFER, NULL };
>  	struct bios_return *bios_return;
> -	union acpi_object *obj = NULL;
> -	struct bios_args *args = NULL;
> +	union acpi_object *obj __free(kfree) = NULL;
> +	struct bios_args *args __free(kfree) = NULL;
>  	int mid, actual_insize, actual_outsize;
>  	size_t bios_args_size;
>  	int ret;
> @@ -608,18 +608,16 @@ static int hp_wmi_perform_query(int query, enum hp_wmi_command command,
>  
>  	ret = wmi_evaluate_method(HPWMI_BIOS_GUID, 0, mid, &input, &output);
>  	if (ret)
> -		goto out_free;
> +		return ret;
>  
>  	obj = output.pointer;
>  	if (!obj) {
> -		ret = -EINVAL;
> -		goto out_free;
> +		return -EINVAL;
>  	}
>  
>  	if (obj->type != ACPI_TYPE_BUFFER) {
>  		pr_warn("query 0x%x returned an invalid object 0x%x\n", query, ret);
> -		ret = -EINVAL;
> -		goto out_free;
> +		return -EINVAL;
>  	}
>  
>  	bios_return = (struct bios_return *)obj->buffer.pointer;
> @@ -629,20 +627,16 @@ static int hp_wmi_perform_query(int query, enum hp_wmi_command command,
>  		if (ret != HPWMI_RET_UNKNOWN_COMMAND &&
>  		    ret != HPWMI_RET_UNKNOWN_CMDTYPE)
>  			pr_warn("query 0x%x returned error 0x%x\n", query, ret);
> -		goto out_free;
> +		return ret;
>  	}
>  
>  	/* Ignore output data of zero size */
>  	if (!outsize)
> -		goto out_free;
> +		return ret;
>  
>  	actual_outsize = min(outsize, (int)(obj->buffer.length - sizeof(*bios_return)));
>  	memcpy(buffer, obj->buffer.pointer + sizeof(*bios_return), actual_outsize);
>  	memset(buffer + actual_outsize, 0, outsize - actual_outsize);
> -
> -out_free:
> -	kfree(obj);
> -	kfree(args);
>  	return ret;

Can't this now be return 0; ?

-- 
 i.