diff options
author | Julia Lawall <julia@diku.dk> | 2010-04-27 17:06:04 -0400 |
---|---|---|
committer | Len Brown <len.brown@intel.com> | 2010-05-20 01:02:15 -0400 |
commit | aeb834d95e771499cb0492d127aec3246d1595c8 (patch) | |
tree | 38e007e8ae4689d8446896cf7e9e119bf76d1a1f /drivers/acpi/video.c | |
parent | e40152ee1e1c7a63f4777791863215e3faa37a86 (diff) |
drivers/acpi: 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>
[akpm@linux-foundation.org: don't change handling of `count']
Signed-off-by: Julia Lawall <julia@diku.dk>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'drivers/acpi/video.c')
-rw-r--r-- | drivers/acpi/video.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/acpi/video.c b/drivers/acpi/video.c index a0c93b321482..1a6b305006ef 100644 --- a/drivers/acpi/video.c +++ b/drivers/acpi/video.c | |||
@@ -1007,11 +1007,11 @@ static void acpi_video_device_find_cap(struct acpi_video_device *device) | |||
1007 | result = acpi_video_init_brightness(device); | 1007 | result = acpi_video_init_brightness(device); |
1008 | if (result) | 1008 | if (result) |
1009 | return; | 1009 | return; |
1010 | name = kzalloc(MAX_NAME_LEN, GFP_KERNEL); | 1010 | name = kasprintf(GFP_KERNEL, "acpi_video%d", count); |
1011 | if (!name) | 1011 | if (!name) |
1012 | return; | 1012 | return; |
1013 | count++; | ||
1013 | 1014 | ||
1014 | sprintf(name, "acpi_video%d", count++); | ||
1015 | memset(&props, 0, sizeof(struct backlight_properties)); | 1015 | memset(&props, 0, sizeof(struct backlight_properties)); |
1016 | props.max_brightness = device->brightness->count - 3; | 1016 | props.max_brightness = device->brightness->count - 3; |
1017 | device->backlight = backlight_device_register(name, NULL, device, | 1017 | device->backlight = backlight_device_register(name, NULL, device, |
@@ -1067,10 +1067,10 @@ static void acpi_video_device_find_cap(struct acpi_video_device *device) | |||
1067 | if (device->cap._DCS && device->cap._DSS) { | 1067 | if (device->cap._DCS && device->cap._DSS) { |
1068 | static int count; | 1068 | static int count; |
1069 | char *name; | 1069 | char *name; |
1070 | name = kzalloc(MAX_NAME_LEN, GFP_KERNEL); | 1070 | name = kasprintf(GFP_KERNEL, "acpi_video%d", count); |
1071 | if (!name) | 1071 | if (!name) |
1072 | return; | 1072 | return; |
1073 | sprintf(name, "acpi_video%d", count++); | 1073 | count++; |
1074 | device->output_dev = video_output_register(name, | 1074 | device->output_dev = video_output_register(name, |
1075 | NULL, device, &acpi_output_properties); | 1075 | NULL, device, &acpi_output_properties); |
1076 | kfree(name); | 1076 | kfree(name); |