Skip to content

Commit

Permalink
driver core: Convert to kasprintf() for early dev_name().
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Paul Mundt committed Mar 29, 2010
1 parent ec0ffe2 commit bd05086
Showing 1 changed file with 8 additions and 7 deletions.
15 changes: 8 additions & 7 deletions drivers/base/platform.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down

0 comments on commit bd05086

Please sign in to comment.