Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-11 06:31:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

[PATCH] Driver core: Fix prefix driver links in /sys/module by bus-name

Browse Source 
Modules may have drivers with the same name on different buses.
This patch fixes this problem.

Signed-off-by: Kay Sievers <kay.sievers@vrfy.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
Kay Sievers 2006-12-20 10:39:33 +01:00 committed by Greg Kroah-Hartman
parent 05a8057bb3
commit 7f422e2e84
1 changed files with 33 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
kernel/module.c
View File

@ -1148,10 +1148,10 @@ static int mod_sysfs_setup(struct module *mod,
kobject_uevent(&mod->mkobj.kobj, KOBJ_ADD); kobject_uevent(&mod->mkobj.kobj, KOBJ_ADD);
return 0; return 0;
out_unreg_drivers:
kobject_unregister(mod->drivers_dir);
out_unreg_param: out_unreg_param:
module_param_sysfs_remove(mod); module_param_sysfs_remove(mod);
out_unreg_drivers:
kobject_unregister(mod->drivers_dir);
out_unreg: out_unreg:
kobject_del(&mod->mkobj.kobj); kobject_del(&mod->mkobj.kobj);
kobject_put(&mod->mkobj.kobj); kobject_put(&mod->mkobj.kobj);
@ -2327,8 +2327,22 @@ void print_modules(void)
printk("\n"); printk("\n");
} }
static char *make_driver_name(struct device_driver *drv)
{
char *driver_name;
driver_name = kmalloc(strlen(drv->name) + strlen(drv->bus->name) + 2,
GFP_KERNEL);
if (!driver_name)
return NULL;
sprintf(driver_name, "%s:%s", drv->bus->name, drv->name);
return driver_name;
}
void module_add_driver(struct module *mod, struct device_driver *drv) void module_add_driver(struct module *mod, struct device_driver *drv)
{ {
char *driver_name;
int no_warn; int no_warn;
if (!mod || !drv) if (!mod || !drv)
@ -2336,17 +2350,31 @@ void module_add_driver(struct module *mod, struct device_driver *drv)
/* Don't check return codes; these calls are idempotent */ /* Don't check return codes; these calls are idempotent */
no_warn = sysfs_create_link(&drv->kobj, &mod->mkobj.kobj, "module"); no_warn = sysfs_create_link(&drv->kobj, &mod->mkobj.kobj, "module");
no_warn = sysfs_create_link(mod->drivers_dir, &drv->kobj, drv->name); driver_name = make_driver_name(drv);
if (driver_name) {
no_warn = sysfs_create_link(mod->drivers_dir, &drv->kobj,
driver_name);
kfree(driver_name);
}
} }
EXPORT_SYMBOL(module_add_driver); EXPORT_SYMBOL(module_add_driver);
void module_remove_driver(struct device_driver *drv) void module_remove_driver(struct device_driver *drv)
{ {
char *driver_name;
if (!drv) if (!drv)
return; return;
sysfs_remove_link(&drv->kobj, "module"); sysfs_remove_link(&drv->kobj, "module");
if (drv->owner && drv->owner->drivers_dir) if (drv->owner && drv->owner->drivers_dir) {
sysfs_remove_link(drv->owner->drivers_dir, drv->name); driver_name = make_driver_name(drv);
if (driver_name) {
sysfs_remove_link(drv->owner->drivers_dir,
driver_name);
kfree(driver_name);
}
}
} }
EXPORT_SYMBOL(module_remove_driver); EXPORT_SYMBOL(module_remove_driver);