summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJingoo Han <jg1.han@samsung.com>2013-04-29 16:18:33 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2013-04-29 18:28:22 -0700
commit6636a9944b9d3b6c4a0a27d5be5abc49ceca3381 (patch)
tree2a33f5f28b66ecb2169f720c5d8fdd3022133a05
parente2bf1151edcdb44e9e871e90e7331dc760c9f856 (diff)
downloadlinux-6636a9944b9d3b6c4a0a27d5be5abc49ceca3381.tar.bz2
drivers/rtc/class.c: use struct device as the first argument for devm_rtc_device_register()
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>
-rw-r--r--drivers/rtc/class.c6
-rw-r--r--include/linux/rtc.h4
2 files changed, 5 insertions, 5 deletions
diff --git a/drivers/rtc/class.c b/drivers/rtc/class.c
index b72b40bd7805..66385402d20e 100644
--- 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 d9557689bb8d..c2c28975293c 100644
--- 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);