drivers/rtc/class.c: use struct device as the first argument for devm_rtc_device_regi...

Other devm_* APIs use 'struct device *dev' as the first argument.  Thus,
in order to sync with other devm_* functions, struct device is used as
the first argument for devm_rtc_device_register().

Signed-off-by: Jingoo Han <jg1.han@samsung.com>
Cc: Tejun Heo <tj@kernel.org>
Cc: Alessandro Zummo <a.zummo@towertech.it>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

diff --git a/drivers/rtc/class.c b/drivers/rtc/class.c
index b72b40bd780517dd8f6568ef65fb791277b5df7d..66385402d20ebf52672a2fa2eab03cbe4b59eedc 100644 (file)
--- a/drivers/rtc/class.c
+++ b/drivers/rtc/class.c
@@ -275,8 +275,8 @@ static int devm_rtc_device_match(struct device *dev, void *res, void *data)
 
 /**
  * devm_rtc_device_register - resource managed rtc_device_register()
- * @name: the name of the device
  * @dev: the device to register
+ * @name: the name of the device
  * @ops: the rtc operations structure
  * @owner: the module owner
  *
@@ -287,8 +287,8 @@ static int devm_rtc_device_match(struct device *dev, void *res, void *data)
  * for more information.
  */
 
-struct rtc_device *devm_rtc_device_register(const char *name,
-                                       struct device *dev,
+struct rtc_device *devm_rtc_device_register(struct device *dev,
+                                       const char *name,
                                        const struct rtc_class_ops *ops,
                                        struct module *owner)
 {

diff --git a/include/linux/rtc.h b/include/linux/rtc.h
index d9557689bb8d94a1fdef4d4c522bd4a04f1a7da7..c2c28975293cf01714dde23876b801c696897161 100644 (file)
--- a/include/linux/rtc.h
+++ b/include/linux/rtc.h
@@ -133,8 +133,8 @@ extern struct rtc_device *rtc_device_register(const char *name,
                                        struct device *dev,
                                        const struct rtc_class_ops *ops,
                                        struct module *owner);
-extern struct rtc_device *devm_rtc_device_register(const char *name,
-                                       struct device *dev,
+extern struct rtc_device *devm_rtc_device_register(struct device *dev,
+                                       const char *name,
                                        const struct rtc_class_ops *ops,
                                        struct module *owner);
 extern void rtc_device_unregister(struct rtc_device *rtc);