diff options
| author | Grant Likely <grant.likely@secretlab.ca> | 2010-07-29 17:55:50 -0600 |
|---|---|---|
| committer | Grant Likely <grant.likely@secretlab.ca> | 2010-08-01 01:44:18 -0600 |
| commit | 7fb8f881c54beb05dd4d2c947dada1c636581d87 (patch) | |
| tree | f3a823a5bcb4cc6bc1ed3c2dbc5a02582c9ecb22 /drivers/of | |
| parent | 22ae782f86b726f9cea752c0f269ff6dcdf2f6e1 (diff) | |
of/platform: Register of_platform_drivers with an "of:" prefix
Currently there are some drivers in tree which register both a
platform_driver and an of_platform_driver with the same name. This is
a temporary situation until all the relevant of_platform_drivers are
converted to be normal platform_drivers. Until then, this patch gives
all the of_platform_drivers an "of:" prefix to protect against bogus
matches and namespace conflicts.
Diffstat (limited to 'drivers/of')
| -rw-r--r-- | drivers/of/platform.c | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/drivers/of/platform.c b/drivers/of/platform.c index 30a4641e798a..bb72223c22ae 100644 --- a/drivers/of/platform.c +++ b/drivers/of/platform.c @@ -74,8 +74,22 @@ static void platform_driver_shutdown_shim(struct platform_device *pdev) */ int of_register_platform_driver(struct of_platform_driver *drv) { + char *of_name; + /* setup of_platform_driver to platform_driver adaptors */ drv->platform_driver.driver = drv->driver; + + /* Prefix the driver name with 'of:' to avoid namespace collisions + * and bogus matches. There are some drivers in the tree that + * register both an of_platform_driver and a platform_driver with + * the same name. This is a temporary measure until they are all + * cleaned up --gcl July 29, 2010 */ + of_name = kmalloc(strlen(drv->driver.name) + 5, GFP_KERNEL); + if (!of_name) + return -ENOMEM; + sprintf(of_name, "of:%s", drv->driver.name); + drv->platform_driver.driver.name = of_name; + if (drv->probe) drv->platform_driver.probe = platform_driver_probe_shim; drv->platform_driver.remove = drv->remove; @@ -91,6 +105,8 @@ EXPORT_SYMBOL(of_register_platform_driver); void of_unregister_platform_driver(struct of_platform_driver *drv) { platform_driver_unregister(&drv->platform_driver); + kfree(drv->platform_driver.driver.name); + drv->platform_driver.driver.name = NULL; } EXPORT_SYMBOL(of_unregister_platform_driver); |