summaryrefslogtreecommitdiff
path: root/drivers/base
diff options
context:
space:
mode:
authorPaul Mundt <lethal@linux-sh.org>2010-03-29 15:51:35 +0900
committerPaul Mundt <lethal@linux-sh.org>2010-03-29 15:51:35 +0900
commitbd05086bbe3f241cd552068f9ceba9e19c6ce427 (patch)
tree5d8e28676693907f78b5666af7d6bb7e94c1f855 /drivers/base
parentec0ffe2ee0e0fb9da4409d86bfd72636450f32df (diff)
downloadlinux-3.10-bd05086bbe3f241cd552068f9ceba9e19c6ce427.tar.gz
linux-3.10-bd05086bbe3f241cd552068f9ceba9e19c6ce427.tar.bz2
linux-3.10-bd05086bbe3f241cd552068f9ceba9e19c6ce427.zip
driver core: Convert to kasprintf() for early dev_name().
This is just a simple refactoring patch on top of the early dev_name() support, converting from kstrdup() to kasprintf() as suggested by Kay. Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Diffstat (limited to 'drivers/base')
-rw-r--r--drivers/base/platform.c15
1 files changed, 8 insertions, 7 deletions
diff --git a/drivers/base/platform.c b/drivers/base/platform.c
index d2d4926c5c4..f2377f3d95e 100644
--- a/drivers/base/platform.c
+++ b/drivers/base/platform.c
@@ -1245,19 +1245,20 @@ static int __init early_platform_driver_probe_id(char *class_str,
* rest of the driver core is initialized.
*/
if (!match->dev.init_name) {
- char buf[32];
-
if (match->id != -1)
- snprintf(buf, sizeof(buf), "%s.%d",
- match->name, match->id);
+ match->dev.init_name =
+ kasprintf(GFP_KERNEL, "%s.%d",
+ match->name,
+ match->id);
else
- snprintf(buf, sizeof(buf), "%s",
- match->name);
+ match->dev.init_name =
+ kasprintf(GFP_KERNEL, "%s",
+ match->name);
- match->dev.init_name = kstrdup(buf, GFP_KERNEL);
if (!match->dev.init_name)
return -ENOMEM;
}
+
if (epdrv->pdrv->probe(match))
pr_warning("%s: unable to probe %s early.\n",
class_str, match->name);