From: Jingoo Han Date: Tue, 26 Mar 2013 23:25:15 +0000 (+1100) Subject: drivers/rtc/class.c: use struct device as the first argument for devm_rtc_device_regi... X-Git-Tag: next-20130404~3^2~263 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=65b3413935f0dcd5126251e45e519b27d299d0b2;p=karo-tx-linux.git 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 Cc: Tejun Heo Cc: Alessandro Zummo Signed-off-by: Andrew Morton --- 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);