diff options
Diffstat (limited to 'drivers/rtc')
-rw-r--r-- | drivers/rtc/rtc-ds1553.c | 11 | ||||
-rw-r--r-- | drivers/rtc/rtc-ds1742.c | 11 |
2 files changed, 12 insertions, 10 deletions
diff --git a/drivers/rtc/rtc-ds1553.c b/drivers/rtc/rtc-ds1553.c index afa64c7fa2e2..f98a83a11aae 100644 --- a/drivers/rtc/rtc-ds1553.c +++ b/drivers/rtc/rtc-ds1553.c | |||
@@ -258,8 +258,9 @@ static const struct rtc_class_ops ds1553_rtc_ops = { | |||
258 | .ioctl = ds1553_rtc_ioctl, | 258 | .ioctl = ds1553_rtc_ioctl, |
259 | }; | 259 | }; |
260 | 260 | ||
261 | static ssize_t ds1553_nvram_read(struct kobject *kobj, char *buf, | 261 | static ssize_t ds1553_nvram_read(struct kobject *kobj, |
262 | loff_t pos, size_t size) | 262 | struct bin_attribute *bin_attr, |
263 | char *buf, loff_t pos, size_t size) | ||
263 | { | 264 | { |
264 | struct platform_device *pdev = | 265 | struct platform_device *pdev = |
265 | to_platform_device(container_of(kobj, struct device, kobj)); | 266 | to_platform_device(container_of(kobj, struct device, kobj)); |
@@ -272,8 +273,9 @@ static ssize_t ds1553_nvram_read(struct kobject *kobj, char *buf, | |||
272 | return count; | 273 | return count; |
273 | } | 274 | } |
274 | 275 | ||
275 | static ssize_t ds1553_nvram_write(struct kobject *kobj, char *buf, | 276 | static ssize_t ds1553_nvram_write(struct kobject *kobj, |
276 | loff_t pos, size_t size) | 277 | struct bin_attribute *bin_attr, |
278 | char *buf, loff_t pos, size_t size) | ||
277 | { | 279 | { |
278 | struct platform_device *pdev = | 280 | struct platform_device *pdev = |
279 | to_platform_device(container_of(kobj, struct device, kobj)); | 281 | to_platform_device(container_of(kobj, struct device, kobj)); |
@@ -290,7 +292,6 @@ static struct bin_attribute ds1553_nvram_attr = { | |||
290 | .attr = { | 292 | .attr = { |
291 | .name = "nvram", | 293 | .name = "nvram", |
292 | .mode = S_IRUGO | S_IWUGO, | 294 | .mode = S_IRUGO | S_IWUGO, |
293 | .owner = THIS_MODULE, | ||
294 | }, | 295 | }, |
295 | .size = RTC_OFFSET, | 296 | .size = RTC_OFFSET, |
296 | .read = ds1553_nvram_read, | 297 | .read = ds1553_nvram_read, |
diff --git a/drivers/rtc/rtc-ds1742.c b/drivers/rtc/rtc-ds1742.c index d68288b389dc..d1778ae8bca5 100644 --- a/drivers/rtc/rtc-ds1742.c +++ b/drivers/rtc/rtc-ds1742.c | |||
@@ -127,8 +127,9 @@ static const struct rtc_class_ops ds1742_rtc_ops = { | |||
127 | .set_time = ds1742_rtc_set_time, | 127 | .set_time = ds1742_rtc_set_time, |
128 | }; | 128 | }; |
129 | 129 | ||
130 | static ssize_t ds1742_nvram_read(struct kobject *kobj, char *buf, | 130 | static ssize_t ds1742_nvram_read(struct kobject *kobj, |
131 | loff_t pos, size_t size) | 131 | struct bin_attribute *bin_attr, |
132 | char *buf, loff_t pos, size_t size) | ||
132 | { | 133 | { |
133 | struct platform_device *pdev = | 134 | struct platform_device *pdev = |
134 | to_platform_device(container_of(kobj, struct device, kobj)); | 135 | to_platform_device(container_of(kobj, struct device, kobj)); |
@@ -141,8 +142,9 @@ static ssize_t ds1742_nvram_read(struct kobject *kobj, char *buf, | |||
141 | return count; | 142 | return count; |
142 | } | 143 | } |
143 | 144 | ||
144 | static ssize_t ds1742_nvram_write(struct kobject *kobj, char *buf, | 145 | static ssize_t ds1742_nvram_write(struct kobject *kobj, |
145 | loff_t pos, size_t size) | 146 | struct bin_attribute *bin_attr, |
147 | char *buf, loff_t pos, size_t size) | ||
146 | { | 148 | { |
147 | struct platform_device *pdev = | 149 | struct platform_device *pdev = |
148 | to_platform_device(container_of(kobj, struct device, kobj)); | 150 | to_platform_device(container_of(kobj, struct device, kobj)); |
@@ -159,7 +161,6 @@ static struct bin_attribute ds1742_nvram_attr = { | |||
159 | .attr = { | 161 | .attr = { |
160 | .name = "nvram", | 162 | .name = "nvram", |
161 | .mode = S_IRUGO | S_IWUGO, | 163 | .mode = S_IRUGO | S_IWUGO, |
162 | .owner = THIS_MODULE, | ||
163 | }, | 164 | }, |
164 | .read = ds1742_nvram_read, | 165 | .read = ds1742_nvram_read, |
165 | .write = ds1742_nvram_write, | 166 | .write = ds1742_nvram_write, |