diff options
author | Andy Shevchenko <andriy.shevchenko@linux.intel.com> | 2018-02-16 10:40:24 -0500 |
---|---|---|
committer | Andy Shevchenko <andriy.shevchenko@linux.intel.com> | 2018-02-19 10:03:43 -0500 |
commit | 7f166addbebdcaeefe36997d5b8dceb96c5619fa (patch) | |
tree | d66206c1b447f0b842c0d684ce0a219432e0b0d1 /drivers/platform/x86/wmi.c | |
parent | 04e4e888558ebe5d9701e31bba61d4e256ab71a8 (diff) |
platform/x86: wmi: Replace kmalloc + sprintf() with kasprintf()
kasprintf() does the job of two: kmalloc() and sprintf().
Replace two calls with one.
Reviewed-by: Darren Hart (VMware) <dvhart@infradead.org>
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Diffstat (limited to 'drivers/platform/x86/wmi.c')
-rw-r--r-- | drivers/platform/x86/wmi.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/platform/x86/wmi.c b/drivers/platform/x86/wmi.c index c0c8945603cb..4e76ffcb5394 100644 --- a/drivers/platform/x86/wmi.c +++ b/drivers/platform/x86/wmi.c | |||
@@ -933,12 +933,11 @@ static int wmi_dev_probe(struct device *dev) | |||
933 | goto probe_failure; | 933 | goto probe_failure; |
934 | } | 934 | } |
935 | 935 | ||
936 | buf = kmalloc(strlen(wdriver->driver.name) + 5, GFP_KERNEL); | 936 | buf = kasprintf(GFP_KERNEL, "wmi/%s", wdriver->driver.name); |
937 | if (!buf) { | 937 | if (!buf) { |
938 | ret = -ENOMEM; | 938 | ret = -ENOMEM; |
939 | goto probe_string_failure; | 939 | goto probe_string_failure; |
940 | } | 940 | } |
941 | sprintf(buf, "wmi/%s", wdriver->driver.name); | ||
942 | wblock->char_dev.minor = MISC_DYNAMIC_MINOR; | 941 | wblock->char_dev.minor = MISC_DYNAMIC_MINOR; |
943 | wblock->char_dev.name = buf; | 942 | wblock->char_dev.name = buf; |
944 | wblock->char_dev.fops = &wmi_fops; | 943 | wblock->char_dev.fops = &wmi_fops; |