forked from luck/tmp_suning_uos_patched
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>
This commit is contained in:
parent
ec0ffe2ee0
commit
bd05086bbe
@ -1245,19 +1245,20 @@ static int __init early_platform_driver_probe_id(char *class_str,
|
|||||||
* rest of the driver core is initialized.
|
* rest of the driver core is initialized.
|
||||||
*/
|
*/
|
||||||
if (!match->dev.init_name) {
|
if (!match->dev.init_name) {
|
||||||
char buf[32];
|
|
||||||
|
|
||||||
if (match->id != -1)
|
if (match->id != -1)
|
||||||
snprintf(buf, sizeof(buf), "%s.%d",
|
match->dev.init_name =
|
||||||
match->name, match->id);
|
kasprintf(GFP_KERNEL, "%s.%d",
|
||||||
|
match->name,
|
||||||
|
match->id);
|
||||||
else
|
else
|
||||||
snprintf(buf, sizeof(buf), "%s",
|
match->dev.init_name =
|
||||||
match->name);
|
kasprintf(GFP_KERNEL, "%s",
|
||||||
|
match->name);
|
||||||
|
|
||||||
match->dev.init_name = kstrdup(buf, GFP_KERNEL);
|
|
||||||
if (!match->dev.init_name)
|
if (!match->dev.init_name)
|
||||||
return -ENOMEM;
|
return -ENOMEM;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (epdrv->pdrv->probe(match))
|
if (epdrv->pdrv->probe(match))
|
||||||
pr_warning("%s: unable to probe %s early.\n",
|
pr_warning("%s: unable to probe %s early.\n",
|
||||||
class_str, match->name);
|
class_str, match->name);
|
||||||
|
Loading…
Reference in New Issue
Block a user