diff options
author | Laurent riffard <laurent.riffard@free.fr> | 2005-10-27 17:12:54 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2005-11-10 19:09:16 -0500 |
commit | 863b18f4b5e7d9e6903b353328cf6fa084dbb619 (patch) | |
tree | e181466c3e7e676fa08e4bce2052ada38d98228d /drivers/pci | |
parent | f8eb1005a5bdb019d2a4ff3ef8d8e8015b22afcb (diff) |
[PATCH] PCI: automatically set device_driver.owner
A nice feature of sysfs is that it can create the symlink from the
driver to the module that is contained in it.
It requires that the device_driver.owner is set, what is not the
case for many PCI drivers.
This patch allows pci_register_driver to set automatically the
device_driver.owner for any PCI driver.
Credits to Al Viro who suggested the method.
Signed-off-by: Laurent Riffard <laurent.riffard@free.fr>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
--
drivers/ide/setup-pci.c | 12 +++++++-----
drivers/pci/pci-driver.c | 9 +++++----
include/linux/ide.h | 3 ++-
include/linux/pci.h | 10 ++++++++--
4 files changed, 22 insertions(+), 12 deletions(-)
Diffstat (limited to 'drivers/pci')
-rw-r--r-- | drivers/pci/pci-driver.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/drivers/pci/pci-driver.c b/drivers/pci/pci-driver.c index efb88c10ed16..a9046d4b8af3 100644 --- a/drivers/pci/pci-driver.c +++ b/drivers/pci/pci-driver.c | |||
@@ -364,15 +364,16 @@ static struct kobj_type pci_driver_kobj_type = { | |||
364 | }; | 364 | }; |
365 | 365 | ||
366 | /** | 366 | /** |
367 | * pci_register_driver - register a new pci driver | 367 | * __pci_register_driver - register a new pci driver |
368 | * @drv: the driver structure to register | 368 | * @drv: the driver structure to register |
369 | * @owner: owner module of drv | ||
369 | * | 370 | * |
370 | * Adds the driver structure to the list of registered drivers. | 371 | * Adds the driver structure to the list of registered drivers. |
371 | * Returns a negative value on error, otherwise 0. | 372 | * Returns a negative value on error, otherwise 0. |
372 | * If no error occurred, the driver remains registered even if | 373 | * If no error occurred, the driver remains registered even if |
373 | * no device was claimed during registration. | 374 | * no device was claimed during registration. |
374 | */ | 375 | */ |
375 | int pci_register_driver(struct pci_driver *drv) | 376 | int __pci_register_driver(struct pci_driver *drv, struct module *owner) |
376 | { | 377 | { |
377 | int error; | 378 | int error; |
378 | 379 | ||
@@ -389,7 +390,7 @@ int pci_register_driver(struct pci_driver *drv) | |||
389 | printk(KERN_WARNING "Warning: PCI driver %s has a struct " | 390 | printk(KERN_WARNING "Warning: PCI driver %s has a struct " |
390 | "device_driver shutdown method, please update!\n", | 391 | "device_driver shutdown method, please update!\n", |
391 | drv->name); | 392 | drv->name); |
392 | drv->driver.owner = drv->owner; | 393 | drv->driver.owner = owner; |
393 | drv->driver.kobj.ktype = &pci_driver_kobj_type; | 394 | drv->driver.kobj.ktype = &pci_driver_kobj_type; |
394 | 395 | ||
395 | spin_lock_init(&drv->dynids.lock); | 396 | spin_lock_init(&drv->dynids.lock); |
@@ -526,7 +527,7 @@ postcore_initcall(pci_driver_init); | |||
526 | 527 | ||
527 | EXPORT_SYMBOL(pci_match_id); | 528 | EXPORT_SYMBOL(pci_match_id); |
528 | EXPORT_SYMBOL(pci_match_device); | 529 | EXPORT_SYMBOL(pci_match_device); |
529 | EXPORT_SYMBOL(pci_register_driver); | 530 | EXPORT_SYMBOL(__pci_register_driver); |
530 | EXPORT_SYMBOL(pci_unregister_driver); | 531 | EXPORT_SYMBOL(pci_unregister_driver); |
531 | EXPORT_SYMBOL(pci_dev_driver); | 532 | EXPORT_SYMBOL(pci_dev_driver); |
532 | EXPORT_SYMBOL(pci_bus_type); | 533 | EXPORT_SYMBOL(pci_bus_type); |