[PATCH 11/28] USB: add the sysfs driver name to all modules

From: Greg Kroah-Hartman <[email protected]>

This adds the module name to all USB drivers, if they are built into the
kernel or not.  It will show up in /sys/modules/MODULE_NAME/drivers/

Cc: Kay Sievers <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>
---
 drivers/usb/core/driver.c |    4 +++-
 include/linux/usb.h       |    5 +++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/drivers/usb/core/driver.c b/drivers/usb/core/driver.c
index d6eb5ce..d505926 100644
--- a/drivers/usb/core/driver.c
+++ b/drivers/usb/core/driver.c
@@ -750,7 +750,8 @@ EXPORT_SYMBOL_GPL(usb_deregister_device_driver);
  * usb_register_dev() to enable that functionality.  This function no longer
  * takes care of that.
  */
-int usb_register_driver(struct usb_driver *new_driver, struct module *owner)
+int usb_register_driver(struct usb_driver *new_driver, struct module *owner,
+			const char *mod_name)
 {
 	int retval = 0;
 
@@ -763,6 +764,7 @@ int usb_register_driver(struct usb_driver *new_driver, struct module *owner)
 	new_driver->drvwrap.driver.probe = usb_probe_interface;
 	new_driver->drvwrap.driver.remove = usb_unbind_interface;
 	new_driver->drvwrap.driver.owner = owner;
+	new_driver->drvwrap.driver.mod_name = mod_name;
 	spin_lock_init(&new_driver->dynids.lock);
 	INIT_LIST_HEAD(&new_driver->dynids.list);
 
diff --git a/include/linux/usb.h b/include/linux/usb.h
index aab5b1b..733f38d 100644
--- a/include/linux/usb.h
+++ b/include/linux/usb.h
@@ -868,10 +868,11 @@ struct usb_class_driver {
  * use these in module_init()/module_exit()
  * and don't forget MODULE_DEVICE_TABLE(usb, ...)
  */
-extern int usb_register_driver(struct usb_driver *, struct module *);
+extern int usb_register_driver(struct usb_driver *, struct module *,
+			       const char *);
 static inline int usb_register(struct usb_driver *driver)
 {
-	return usb_register_driver(driver, THIS_MODULE);
+	return usb_register_driver(driver, THIS_MODULE, KBUILD_MODNAME);
 }
 extern void usb_deregister(struct usb_driver *);
 
-- 
1.4.4.4

-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [email protected]
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

---

• Follow-Ups:
  • [PATCH 12/28] /sys/modules/*/holders
    • From: Greg KH <[email protected]>

• References:
  • [GIT PATCH] Driver core patches for 2.6.20
    • From: Greg KH <[email protected]>
  • [PATCH 1/28] Kobject: make kobject apis more robust in handling NULL pointers
    • From: Greg KH <[email protected]>
  • [PATCH 2/28] Driver core: convert pcmcia code to use struct device
    • From: Greg KH <[email protected]>
  • [PATCH 3/28] Driver core: convert SPI code to use struct device
    • From: Greg KH <[email protected]>
  • [PATCH 4/28] Network: convert network devices to use struct device instead of class_device
    • From: Greg KH <[email protected]>
  • [PATCH 5/28] driver core: Remove device_is_registered() in device_move().
    • From: Greg KH <[email protected]>
  • [PATCH 6/28] driver core: Allow device_move(dev, NULL).
    • From: Greg KH <[email protected]>
  • [PATCH 7/28] MODULES: add the module name for built in kernel drivers
    • From: Greg KH <[email protected]>
  • [PATCH 8/28] Modules: only add drivers/ direcory if needed
    • From: Greg KH <[email protected]>
  • [PATCH 9/28] PCI: add the sysfs driver name to all modules
    • From: Greg KH <[email protected]>
  • [PATCH 10/28] SERIO: add the sysfs driver name to all modules
    • From: Greg KH <[email protected]>

• Prev by Date: [PATCH 10/28] SERIO: add the sysfs driver name to all modules
• Next by Date: [PATCH 13/28] driver core fixes: make_class_name() retval checks
• Previous by thread: [PATCH 10/28] SERIO: add the sysfs driver name to all modules
• Next by thread: [PATCH 12/28] /sys/modules/*/holders
• Index(es):
  • Date
  • Thread

[Index of Archives]     [Kernel Newbies]     [Netfilter]     [Bugtraq]     [Photo]     [Stuff]     [Gimp]     [Yosemite News]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Video 4 Linux]     [Linux for the blind]     [Linux Resources]