aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/base/platform.c
diff options
context:
space:
mode:
authorPaul Mundt <lethal@linux-sh.org>2010-03-09 01:57:53 -0500
committerPaul Mundt <lethal@linux-sh.org>2010-03-09 23:08:32 -0500
commita636ee7fb35b731ba2b331f6294e809bb6be09c8 (patch)
treecff3b2505cb6dcee3a8babbb6347dfab13f185cc /drivers/base/platform.c
parent57d54889cd00db2752994b389ba714138652e60c (diff)
driver core: Early dev_name() support.
Presently early platform devices suffer from the fact they are unable to use dev_xxx() calls early on due to dev_name() and others being unavailable at the time ->probe() is called. This implements early init_name construction from the matched name/id pair following the semantics of the late device/driver match. As a result, matched IDs (inclusive of requested ones) are preserved when the handoff from the early platform code happens at kobject initialization time. Since we still require kmalloc slabs to be available at this point, using kstrdup() for establishing the init_name works fine. This subsequently needs to be tested from dev_name() prior to the init_name being cleared by the driver core. We don't kfree() since others will already have a handle on the string long before the kobject initialization takes place. This is also needed to permit drivers to use the clock framework early, without having to manually construct their own device IDs from the match id/name pair locally (needed by the early console and timer code on sh and arm). Signed-off-by: Paul Mundt <lethal@linux-sh.org> Acked-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/base/platform.c')
-rw-r--r--drivers/base/platform.c19
1 files changed, 19 insertions, 0 deletions
diff --git a/drivers/base/platform.c b/drivers/base/platform.c
index 1ba9d617d241..d2d4926c5c4c 100644
--- a/drivers/base/platform.c
+++ b/drivers/base/platform.c
@@ -1239,6 +1239,25 @@ static int __init early_platform_driver_probe_id(char *class_str,
1239 } 1239 }
1240 1240
1241 if (match) { 1241 if (match) {
1242 /*
1243 * Set up a sensible init_name to enable
1244 * dev_name() and others to be used before the
1245 * rest of the driver core is initialized.
1246 */
1247 if (!match->dev.init_name) {
1248 char buf[32];
1249
1250 if (match->id != -1)
1251 snprintf(buf, sizeof(buf), "%s.%d",
1252 match->name, match->id);
1253 else
1254 snprintf(buf, sizeof(buf), "%s",
1255 match->name);
1256
1257 match->dev.init_name = kstrdup(buf, GFP_KERNEL);
1258 if (!match->dev.init_name)
1259 return -ENOMEM;
1260 }
1242 if (epdrv->pdrv->probe(match)) 1261 if (epdrv->pdrv->probe(match))
1243 pr_warning("%s: unable to probe %s early.\n", 1262 pr_warning("%s: unable to probe %s early.\n",
1244 class_str, match->name); 1263 class_str, match->name);