* [tip:x86/urgent] arch/x86/pci: use kasprintf
[not found] <201005241913.o4OJDG3R010871@imap1.linux-foundation.org>
@ 2010-05-24 23:07 ` tip-bot for Julia Lawall
0 siblings, 0 replies; only message in thread
From: tip-bot for Julia Lawall @ 2010-05-24 23:07 UTC (permalink / raw)
To: linux-tip-commits; +Cc: linux-kernel, julia, hpa, mingo, akpm, tglx, hpa
Commit-ID: b46fc5f235be04a7f77fb2af1d8cb809889c25c1
Gitweb: http://git.kernel.org/tip/b46fc5f235be04a7f77fb2af1d8cb809889c25c1
Author: Julia Lawall <julia@diku.dk>
AuthorDate: Mon, 24 May 2010 12:13:16 -0700
Committer: H. Peter Anvin <hpa@linux.intel.com>
CommitDate: Mon, 24 May 2010 13:31:45 -0700
arch/x86/pci: use kasprintf
kasprintf combines kmalloc and sprintf, and takes care of the size
calculation itself.
The semantic patch that makes this change is as follows:
(http://coccinelle.lip6.fr/)
// <smpl>
@@
expression a,flag;
expression list args;
statement S;
@@
a =
- \(kmalloc\|kzalloc\)(...,flag)
+ kasprintf(flag,args)
<... when != a
if (a == NULL || ...) S
...>
- sprintf(a,args);
// </smpl>
Signed-off-by: Julia Lawall <julia@diku.dk>
LKML-Reference: <201005241913.o4OJDG3R010871@imap1.linux-foundation.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
---
arch/x86/pci/acpi.c | 3 +--
1 files changed, 1 insertions(+), 2 deletions(-)
diff --git a/arch/x86/pci/acpi.c b/arch/x86/pci/acpi.c
index 31930fd..7c0ad63 100644
--- a/arch/x86/pci/acpi.c
+++ b/arch/x86/pci/acpi.c
@@ -207,10 +207,9 @@ get_current_resources(struct acpi_device *device, int busnum,
if (!info.res)
goto res_alloc_fail;
- info.name = kmalloc(16, GFP_KERNEL);
+ info.name = kasprintf(GFP_KERNEL, "PCI Bus %04x:%02x", domain, busnum);
if (!info.name)
goto name_alloc_fail;
- sprintf(info.name, "PCI Bus %04x:%02x", domain, busnum);
info.res_num = 0;
acpi_walk_resources(device->handle, METHOD_NAME__CRS, setup_resource,
^ permalink raw reply [flat|nested] only message in thread