rtc: move rtc_add_group/s definitions
Alexandre Belloni
maintainerPATCH 1/2 rtc: move rtc_add_group/s definitions
Move rtc_add_group and rtc_add_groups definition to rtc.h that is available for all RTC drivers.
Signed-off-by Alexandre Belloni <[email protected]>
--- drivers/rtc/rtc-core.h | 14 -------------- include/linux/rtc.h | 16 ++++++++++++++++ 2 files changed, 16 insertions(+), 14 deletions(-)
drivers/rtc/rtc-core.h +0 -14
@@ -40,23 +40,9 @@ static inline void rtc_proc_del_device(struct rtc_device *rtc)#ifdef CONFIG_RTC_INTF_SYSFS const struct attribute_group **rtc_get_dev_attribute_groups (void ); -int rtc_add_group (struct rtc_device *rtc,const struct attribute_group *grp); -int rtc_add_groups (struct rtc_device *rtc,const struct attribute_group **grps);#else static inline const struct attribute_group **rtc_get_dev_attribute_groups (void ) {return NULL ; } - -static inline -int rtc_add_group (struct rtc_device *rtc,const struct attribute_group *grp) -{ -return 0 ; -} - -static inline -int rtc_add_groups (struct rtc_device *rtc,const struct attribute_group **grps) -{ -return 0 ; -}#endif
include/linux/rtc.h +16 -0
@@ -272,4 +272,20 @@ static inline int rtc_nvmem_register(struct rtc_device *rtc,static inline void rtc_nvmem_unregister (struct rtc_device *rtc) {}#endif +#ifdef CONFIG_RTC_INTF_SYSFS +int rtc_add_group (struct rtc_device *rtc,const struct attribute_group *grp); +int rtc_add_groups (struct rtc_device *rtc,const struct attribute_group **grps); +#else +static inline +int rtc_add_group (struct rtc_device *rtc,const struct attribute_group *grp) +{ +return 0 ; +} + +static inline +int rtc_add_groups (struct rtc_device *rtc,const struct attribute_group **grps) +{ +return 0 ; +} +#endif #endif /* _LINUX_RTC_H_ */
Signature · 1 line
2.19.0
Alexandre Belloni
maintainerPATCH 2/2 rtc: isl1208: don't include core header file
The core header file is reserved for the core, stop including it.
Also reorder includes alphabetically.
Signed-off-by Alexandre Belloni <[email protected]>
--- drivers/rtc/rtc-isl1208.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-)
drivers/rtc/rtc-isl1208.c +3 -4
@@ -10,12 +10,11 @@* */ -#include <linux/module.h> -#include <linux/i2c.h> #include <linux/bcd.h> -#include <linux/rtc.h> -#include "rtc-core.h" +#include <linux/i2c.h> +#include <linux/module.h> #include <linux/of_irq.h> +#include <linux/rtc.h> /* Register map */ /* rtc section */
Signature · 1 line
2.19.0