diff options
author | Himanshu Jha <himanshujha199640@gmail.com> | 2018-03-07 13:38:24 -0500 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2018-03-09 12:40:21 -0500 |
commit | 01812ba34a9a7756a46a54f25ba0f02e727ff35c (patch) | |
tree | 3fa4f80c0078d0eac963bfb1ca41d552fc2be68c | |
parent | 161c3bc30f3a07458f91f15e35d5b2e91fa617cc (diff) |
usb: isp1760: Use kasprintf
Use kasprintf instead of combination of kmalloc and sprintf and
therefore avoid unnecessary computation of string length.
Also, remove the useless local variable.
Signed-off-by: Himanshu Jha <himanshujha199640@gmail.com>
Reviewed-by: Kees Cook <keescook@chromium.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r-- | drivers/usb/isp1760/isp1760-udc.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/drivers/usb/isp1760/isp1760-udc.c b/drivers/usb/isp1760/isp1760-udc.c index bac4ef5d9512..1714b2258b54 100644 --- a/drivers/usb/isp1760/isp1760-udc.c +++ b/drivers/usb/isp1760/isp1760-udc.c | |||
@@ -1441,7 +1441,6 @@ int isp1760_udc_register(struct isp1760_device *isp, int irq, | |||
1441 | unsigned long irqflags) | 1441 | unsigned long irqflags) |
1442 | { | 1442 | { |
1443 | struct isp1760_udc *udc = &isp->udc; | 1443 | struct isp1760_udc *udc = &isp->udc; |
1444 | const char *devname; | ||
1445 | int ret; | 1444 | int ret; |
1446 | 1445 | ||
1447 | udc->irq = -1; | 1446 | udc->irq = -1; |
@@ -1455,13 +1454,10 @@ int isp1760_udc_register(struct isp1760_device *isp, int irq, | |||
1455 | if (ret < 0) | 1454 | if (ret < 0) |
1456 | return ret; | 1455 | return ret; |
1457 | 1456 | ||
1458 | devname = dev_name(isp->dev); | 1457 | udc->irqname = kasprintf(GFP_KERNEL, "%s (udc)", dev_name(isp->dev)); |
1459 | udc->irqname = kmalloc(strlen(devname) + 7, GFP_KERNEL); | ||
1460 | if (!udc->irqname) | 1458 | if (!udc->irqname) |
1461 | return -ENOMEM; | 1459 | return -ENOMEM; |
1462 | 1460 | ||
1463 | sprintf(udc->irqname, "%s (udc)", devname); | ||
1464 | |||
1465 | ret = request_irq(irq, isp1760_udc_irq, IRQF_SHARED | irqflags, | 1461 | ret = request_irq(irq, isp1760_udc_irq, IRQF_SHARED | irqflags, |
1466 | udc->irqname, udc); | 1462 | udc->irqname, udc); |
1467 | if (ret < 0) | 1463 | if (ret < 0) |