[PATCH] usb/gadget: use kasprintf() instead of open coding it

[PATCH] usb/gadget: use kasprintf() instead of open coding it

[Juergen Gross]

Signed-off-by: Juergen Gross <jgross@suse.com>
---
 drivers/usb/gadget/composite.c | 14 ++------------
 1 file changed, 2 insertions(+), 12 deletions(-)

diff --git a/drivers/usb/gadget/composite.c b/drivers/usb/gadget/composite.c
index 32176f7..455efec 100644
--- a/drivers/usb/gadget/composite.c
+++ b/drivers/usb/gadget/composite.c
@@ -2382,18 +2382,8 @@ EXPORT_SYMBOL_GPL(usb_composite_setup_continue);
 
 static char *composite_default_mfr(struct usb_gadget *gadget)
 {
-	char *mfr;
-	int len;
-
-	len = snprintf(NULL, 0, "%s %s with %s", init_utsname()->sysname,
-			init_utsname()->release, gadget->name);
-	len++;
-	mfr = kmalloc(len, GFP_KERNEL);
-	if (!mfr)
-		return NULL;
-	snprintf(mfr, len, "%s %s with %s", init_utsname()->sysname,
-			init_utsname()->release, gadget->name);
-	return mfr;
+	return kasprintf(GFP_KERNEL, "%s %s with %s", init_utsname()->sysname,
+			 init_utsname()->release, gadget->name);
 }
 
 void usb_composite_overwrite_options(struct usb_composite_dev *cdev,
-- 
2.6.6

Re: [PATCH] usb/gadget: use kasprintf() instead of open coding it

[Felipe Balbi]

[-- Attachment #1: Type: text/plain, Size: 1316 bytes --]


Hi,

Juergen Gross <jgross@suse.com> writes:

> Signed-off-by: Juergen Gross <jgross@suse.com>

I can't apply anything without a commit log. Sorry.

> diff --git a/drivers/usb/gadget/composite.c b/drivers/usb/gadget/composite.c
> index 32176f7..455efec 100644
> --- a/drivers/usb/gadget/composite.c
> +++ b/drivers/usb/gadget/composite.c
> @@ -2382,18 +2382,8 @@ EXPORT_SYMBOL_GPL(usb_composite_setup_continue);
>  
>  static char *composite_default_mfr(struct usb_gadget *gadget)
>  {
> -	char *mfr;
> -	int len;
> -
> -	len = snprintf(NULL, 0, "%s %s with %s", init_utsname()->sysname,
> -			init_utsname()->release, gadget->name);
> -	len++;
> -	mfr = kmalloc(len, GFP_KERNEL);
> -	if (!mfr)
> -		return NULL;
> -	snprintf(mfr, len, "%s %s with %s", init_utsname()->sysname,
> -			init_utsname()->release, gadget->name);
> -	return mfr;
> +	return kasprintf(GFP_KERNEL, "%s %s with %s", init_utsname()->sysname,
> +			 init_utsname()->release, gadget->name);
>  }
>  
>  void usb_composite_overwrite_options(struct usb_composite_dev *cdev,
> -- 
> 2.6.6
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-usb" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html

-- 
balbi

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 800 bytes --]

Re: [PATCH] usb/gadget: use kasprintf() instead of open coding it

[Juergen Gross]

On 10/10/16 12:26, Felipe Balbi wrote:
> 
> Hi,
> 
> Juergen Gross <jgross@suse.com> writes:
> 
>> Signed-off-by: Juergen Gross <jgross@suse.com>
> 
> I can't apply anything without a commit log. Sorry.

I always thought a subject line telling the complete story would be
enough. I'll resend with the subject duplicated to the body.


Juergen

> 
>> diff --git a/drivers/usb/gadget/composite.c b/drivers/usb/gadget/composite.c
>> index 32176f7..455efec 100644
>> --- a/drivers/usb/gadget/composite.c
>> +++ b/drivers/usb/gadget/composite.c
>> @@ -2382,18 +2382,8 @@ EXPORT_SYMBOL_GPL(usb_composite_setup_continue);
>>  
>>  static char *composite_default_mfr(struct usb_gadget *gadget)
>>  {
>> -	char *mfr;
>> -	int len;
>> -
>> -	len = snprintf(NULL, 0, "%s %s with %s", init_utsname()->sysname,
>> -			init_utsname()->release, gadget->name);
>> -	len++;
>> -	mfr = kmalloc(len, GFP_KERNEL);
>> -	if (!mfr)
>> -		return NULL;
>> -	snprintf(mfr, len, "%s %s with %s", init_utsname()->sysname,
>> -			init_utsname()->release, gadget->name);
>> -	return mfr;
>> +	return kasprintf(GFP_KERNEL, "%s %s with %s", init_utsname()->sysname,
>> +			 init_utsname()->release, gadget->name);
>>  }
>>  
>>  void usb_composite_overwrite_options(struct usb_composite_dev *cdev,
>> -- 
>> 2.6.6
>>
>> --
>> To unsubscribe from this list: send the line "unsubscribe linux-usb" in
>> the body of a message to majordomo@vger.kernel.org
>> More majordomo info at  http://vger.kernel.org/majordomo-info.html
>