aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJingoo Han <jg1.han@samsung.com>2013-04-29 19:18:33 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2013-04-29 21:28:22 -0400
commit6636a9944b9d3b6c4a0a27d5be5abc49ceca3381 (patch)
tree2a33f5f28b66ecb2169f720c5d8fdd3022133a05
parente2bf1151edcdb44e9e871e90e7331dc760c9f856 (diff)
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)
275 275
276/** 276/**
277 * devm_rtc_device_register - resource managed rtc_device_register() 277 * devm_rtc_device_register - resource managed rtc_device_register()
278 * @name: the name of the device
279 * @dev: the device to register 278 * @dev: the device to register
279 * @name: the name of the device
280 * @ops: the rtc operations structure 280 * @ops: the rtc operations structure
281 * @owner: the module owner 281 * @owner: the module owner
282 * 282 *
@@ -287,8 +287,8 @@ static int devm_rtc_device_match(struct device *dev, void *res, void *data)
287 * for more information. 287 * for more information.
288 */ 288 */
289 289
290struct rtc_device *devm_rtc_device_register(const char *name, 290struct rtc_device *devm_rtc_device_register(struct device *dev,
291 struct device *dev, 291 const char *name,
292 const struct rtc_class_ops *ops, 292 const struct rtc_class_ops *ops,
293 struct module *owner) 293 struct module *owner)
294{ 294{
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,
133 struct device *dev, 133 struct device *dev,
134 const struct rtc_class_ops *ops, 134 const struct rtc_class_ops *ops,
135 struct module *owner); 135 struct module *owner);
136extern struct rtc_device *devm_rtc_device_register(const char *name, 136extern struct rtc_device *devm_rtc_device_register(struct device *dev,
137 struct device *dev, 137 const char *name,
138 const struct rtc_class_ops *ops, 138 const struct rtc_class_ops *ops,
139 struct module *owner); 139 struct module *owner);
140extern void rtc_device_unregister(struct rtc_device *rtc); 140extern void rtc_device_unregister(struct rtc_device *rtc);