module: use a macro instead of platform_driver_register

PATCH In review Libo Chen 2 participants 3 messages May 25, 2013 – May 28, 2013 Driver core

Share & tools

Libo Chen

author

2013-05-25 04:40 UTC #0 lore raw

PATCH 1/1 module: use a macro instead of platform_driver_register

I found a lot of mistakes using struct platform_driver without owner so I make a macro instead of the function platform_driver_register. It can set owner in it, then guys don`t care about module owner again.

Signed-off-by Libo Chen <[email protected]>

---
 drivers/base/platform.c         |    8 +++++---
 include/linux/platform_device.h |    8 +++++++-
 2 files changed, 12 insertions(+), 4 deletions(-)

drivers/base/platform.c +5 -3

index 9eda842..ed75cf6 100644
@@ -523,11 +523,13 @@ static void platform_drv_shutdown(struct device *_dev)
 }
 
 /**
- * platform_driver_register - register a driver for platform-level devices
+ * __platform_driver_register - register a driver for platform-level devices
  * @drv: platform driver structure
  */
-int platform_driver_register(struct platform_driver *drv)
+int __platform_driver_register(struct platform_driver *drv,
+				struct module *owner)
 {
+	drv->driver.owner = owner;
 	drv->driver.bus = &platform_bus_type;
 	if (drv->probe)
 		drv->driver.probe = platform_drv_probe;

@@ -538,7 +540,7 @@ int platform_driver_register(struct platform_driver *drv)
 
 	return driver_register(&drv->driver);
 }
-EXPORT_SYMBOL_GPL(platform_driver_register);
+EXPORT_SYMBOL_GPL(__platform_driver_register);
 
 /**
  * platform_driver_unregister - unregister a driver for platform-level devices

include/linux/platform_device.h +7 -1

index 9abf1db..cd46ee5 100644
@@ -180,7 +180,13 @@ struct platform_driver {
 	const struct platform_device_id *id_table;
 };
 
-extern int platform_driver_register(struct platform_driver *);
+/*
+ * use a macro to avoid include chaining to get THIS_MODULE
+ */
+#define platform_driver_register(drv) \
+	__platform_driver_register(drv, THIS_MODULE)
+extern int __platform_driver_register(struct platform_driver *,
+					struct module *);
 extern void platform_driver_unregister(struct platform_driver *);
 
 /* non-hotpluggable platform devices may use this so that probe() and

Signature · 1 line

1.7.1

Greg KH

maintainer

2013-05-25 12:22 UTC #1 lore raw

Quoted 6 lines · Libo Chen

I found a lot of mistakes using struct platform_driver without owner so I make a macro instead of the function platform_driver_register. It can set owner in it, then guys don`t care about module owner again.
Signed-off-by Libo Chen <[email protected]>

Nice job, that's the better way to fix this, I'll queue it up for 3.11.

thanks,

greg k-h

Libo Chen

author

2013-05-28 07:42 UTC #2 lore raw

Quoted 10 lines · Greg KH

Quoted 6 lines · Libo Chen
I found a lot of mistakes using struct platform_driver without owner so I make a macro instead of the function platform_driver_register. It can set owner in it, then guys don`t care about module owner again.
Signed-off-by Libo Chen <[email protected]>
Nice job, that's the better way to fix this, I'll queue it up for 3.11.

Thank Gu, Thomas, David and yours suggestions!

Regards

Libo

Quoted 6 lines

thanks,
greg k-h
.