diff options
author | Julia Lawall <julia@diku.dk> | 2010-03-10 16:18:13 -0500 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-05-21 12:37:29 -0400 |
commit | 1653268b1b538981df9bb85d637456530938be6c (patch) | |
tree | f091543b753e57e975bee35909b96c674daf3bd3 /drivers/base/module.c | |
parent | ffa156590f98b750161757a16c37ac8e152a7859 (diff) |
driver core: module.c: 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>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/base/module.c')
-rw-r--r-- | drivers/base/module.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/base/module.c b/drivers/base/module.c index f32f2f9b7be5..db930d3ee312 100644 --- a/drivers/base/module.c +++ b/drivers/base/module.c | |||
@@ -15,12 +15,10 @@ static char *make_driver_name(struct device_driver *drv) | |||
15 | { | 15 | { |
16 | char *driver_name; | 16 | char *driver_name; |
17 | 17 | ||
18 | driver_name = kmalloc(strlen(drv->name) + strlen(drv->bus->name) + 2, | 18 | driver_name = kasprintf(GFP_KERNEL, "%s:%s", drv->bus->name, drv->name); |
19 | GFP_KERNEL); | ||
20 | if (!driver_name) | 19 | if (!driver_name) |
21 | return NULL; | 20 | return NULL; |
22 | 21 | ||
23 | sprintf(driver_name, "%s:%s", drv->bus->name, drv->name); | ||
24 | return driver_name; | 22 | return driver_name; |
25 | } | 23 | } |
26 | 24 | ||