aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Brownell <david-b@pacbell.net>2006-10-01 02:28:17 -0400
committerLinus Torvalds <torvalds@g5.osdl.org>2006-10-01 03:39:25 -0400
commitff8371ac9a5a55c956991fed8e5f58640c7a32f3 (patch)
tree893271623ab3f66ec54e2c27ef93598975f4efbc
parentdb621f174d2c017d960089ea8cbc91c0763f1069 (diff)
[PATCH] constify rtc_class_ops: update drivers
Update RTC framework so that drivers can constify their method tables, moving them from ".data" to ".rodata". Then update the drivers. Signed-off-by: David Brownell <dbrownell@users.sourceforge.net> Cc: Alessandro Zummo <a.zummo@towertech.it> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
-rw-r--r--drivers/rtc/class.c2
-rw-r--r--drivers/rtc/rtc-at91.c2
-rw-r--r--drivers/rtc/rtc-dev.c4
-rw-r--r--drivers/rtc/rtc-ds1307.c2
-rw-r--r--drivers/rtc/rtc-ds1553.c2
-rw-r--r--drivers/rtc/rtc-ds1672.c2
-rw-r--r--drivers/rtc/rtc-ds1742.c2
-rw-r--r--drivers/rtc/rtc-ep93xx.c2
-rw-r--r--drivers/rtc/rtc-isl1208.c2
-rw-r--r--drivers/rtc/rtc-m48t86.c2
-rw-r--r--drivers/rtc/rtc-max6902.c2
-rw-r--r--drivers/rtc/rtc-pcf8563.c2
-rw-r--r--drivers/rtc/rtc-pcf8583.c2
-rw-r--r--drivers/rtc/rtc-pl031.c2
-rw-r--r--drivers/rtc/rtc-proc.c2
-rw-r--r--drivers/rtc/rtc-rs5c348.c2
-rw-r--r--drivers/rtc/rtc-rs5c372.c2
-rw-r--r--drivers/rtc/rtc-s3c.c2
-rw-r--r--drivers/rtc/rtc-sa1100.c2
-rw-r--r--drivers/rtc/rtc-test.c2
-rw-r--r--drivers/rtc/rtc-v3020.c2
-rw-r--r--drivers/rtc/rtc-vr41xx.c2
-rw-r--r--drivers/rtc/rtc-x1205.c2
-rw-r--r--include/linux/rtc.h4
24 files changed, 26 insertions, 26 deletions
diff --git a/drivers/rtc/class.c b/drivers/rtc/class.c
index 306d600a764a..7a0d8ee2de9c 100644
--- a/drivers/rtc/class.c
+++ b/drivers/rtc/class.c
@@ -39,7 +39,7 @@ static void rtc_device_release(struct class_device *class_dev)
39 * Returns the pointer to the new struct class device. 39 * Returns the pointer to the new struct class device.
40 */ 40 */
41struct rtc_device *rtc_device_register(const char *name, struct device *dev, 41struct rtc_device *rtc_device_register(const char *name, struct device *dev,
42 struct rtc_class_ops *ops, 42 const struct rtc_class_ops *ops,
43 struct module *owner) 43 struct module *owner)
44{ 44{
45 struct rtc_device *rtc; 45 struct rtc_device *rtc;
diff --git a/drivers/rtc/rtc-at91.c b/drivers/rtc/rtc-at91.c
index dfd0ce86f6a0..3cf3529888c7 100644
--- a/drivers/rtc/rtc-at91.c
+++ b/drivers/rtc/rtc-at91.c
@@ -267,7 +267,7 @@ static irqreturn_t at91_rtc_interrupt(int irq, void *dev_id,
267 return IRQ_NONE; /* not handled */ 267 return IRQ_NONE; /* not handled */
268} 268}
269 269
270static struct rtc_class_ops at91_rtc_ops = { 270static const struct rtc_class_ops at91_rtc_ops = {
271 .ioctl = at91_rtc_ioctl, 271 .ioctl = at91_rtc_ioctl,
272 .read_time = at91_rtc_readtime, 272 .read_time = at91_rtc_readtime,
273 .set_time = at91_rtc_settime, 273 .set_time = at91_rtc_settime,
diff --git a/drivers/rtc/rtc-dev.c b/drivers/rtc/rtc-dev.c
index 629d47cc7e88..583789c66cdb 100644
--- a/drivers/rtc/rtc-dev.c
+++ b/drivers/rtc/rtc-dev.c
@@ -24,7 +24,7 @@ static int rtc_dev_open(struct inode *inode, struct file *file)
24 int err; 24 int err;
25 struct rtc_device *rtc = container_of(inode->i_cdev, 25 struct rtc_device *rtc = container_of(inode->i_cdev,
26 struct rtc_device, char_dev); 26 struct rtc_device, char_dev);
27 struct rtc_class_ops *ops = rtc->ops; 27 const struct rtc_class_ops *ops = rtc->ops;
28 28
29 /* We keep the lock as long as the device is in use 29 /* We keep the lock as long as the device is in use
30 * and return immediately if busy 30 * and return immediately if busy
@@ -209,7 +209,7 @@ static int rtc_dev_ioctl(struct inode *inode, struct file *file,
209 int err = 0; 209 int err = 0;
210 struct class_device *class_dev = file->private_data; 210 struct class_device *class_dev = file->private_data;
211 struct rtc_device *rtc = to_rtc_device(class_dev); 211 struct rtc_device *rtc = to_rtc_device(class_dev);
212 struct rtc_class_ops *ops = rtc->ops; 212 const struct rtc_class_ops *ops = rtc->ops;
213 struct rtc_time tm; 213 struct rtc_time tm;
214 struct rtc_wkalrm alarm; 214 struct rtc_wkalrm alarm;
215 void __user *uarg = (void __user *) arg; 215 void __user *uarg = (void __user *) arg;
diff --git a/drivers/rtc/rtc-ds1307.c b/drivers/rtc/rtc-ds1307.c
index e8afb9384786..cc5032b6f42a 100644
--- a/drivers/rtc/rtc-ds1307.c
+++ b/drivers/rtc/rtc-ds1307.c
@@ -178,7 +178,7 @@ static int ds1307_set_time(struct device *dev, struct rtc_time *t)
178 return 0; 178 return 0;
179} 179}
180 180
181static struct rtc_class_ops ds13xx_rtc_ops = { 181static const struct rtc_class_ops ds13xx_rtc_ops = {
182 .read_time = ds1307_get_time, 182 .read_time = ds1307_get_time,
183 .set_time = ds1307_set_time, 183 .set_time = ds1307_set_time,
184}; 184};
diff --git a/drivers/rtc/rtc-ds1553.c b/drivers/rtc/rtc-ds1553.c
index 209001495474..4fc9422ed86d 100644
--- a/drivers/rtc/rtc-ds1553.c
+++ b/drivers/rtc/rtc-ds1553.c
@@ -250,7 +250,7 @@ static int ds1553_rtc_ioctl(struct device *dev, unsigned int cmd,
250 return 0; 250 return 0;
251} 251}
252 252
253static struct rtc_class_ops ds1553_rtc_ops = { 253static const struct rtc_class_ops ds1553_rtc_ops = {
254 .read_time = ds1553_rtc_read_time, 254 .read_time = ds1553_rtc_read_time,
255 .set_time = ds1553_rtc_set_time, 255 .set_time = ds1553_rtc_set_time,
256 .read_alarm = ds1553_rtc_read_alarm, 256 .read_alarm = ds1553_rtc_read_alarm,
diff --git a/drivers/rtc/rtc-ds1672.c b/drivers/rtc/rtc-ds1672.c
index 9be81fd4737c..9c68ec99afa5 100644
--- a/drivers/rtc/rtc-ds1672.c
+++ b/drivers/rtc/rtc-ds1672.c
@@ -156,7 +156,7 @@ static ssize_t show_control(struct device *dev, struct device_attribute *attr, c
156} 156}
157static DEVICE_ATTR(control, S_IRUGO, show_control, NULL); 157static DEVICE_ATTR(control, S_IRUGO, show_control, NULL);
158 158
159static struct rtc_class_ops ds1672_rtc_ops = { 159static const struct rtc_class_ops ds1672_rtc_ops = {
160 .read_time = ds1672_rtc_read_time, 160 .read_time = ds1672_rtc_read_time,
161 .set_time = ds1672_rtc_set_time, 161 .set_time = ds1672_rtc_set_time,
162 .set_mmss = ds1672_rtc_set_mmss, 162 .set_mmss = ds1672_rtc_set_mmss,
diff --git a/drivers/rtc/rtc-ds1742.c b/drivers/rtc/rtc-ds1742.c
index 8e47e5a06d2a..01da5ab15fbc 100644
--- a/drivers/rtc/rtc-ds1742.c
+++ b/drivers/rtc/rtc-ds1742.c
@@ -116,7 +116,7 @@ static int ds1742_rtc_read_time(struct device *dev, struct rtc_time *tm)
116 return 0; 116 return 0;
117} 117}
118 118
119static struct rtc_class_ops ds1742_rtc_ops = { 119static const struct rtc_class_ops ds1742_rtc_ops = {
120 .read_time = ds1742_rtc_read_time, 120 .read_time = ds1742_rtc_read_time,
121 .set_time = ds1742_rtc_set_time, 121 .set_time = ds1742_rtc_set_time,
122}; 122};
diff --git a/drivers/rtc/rtc-ep93xx.c b/drivers/rtc/rtc-ep93xx.c
index e1a1169e4664..ef4f147f3c0c 100644
--- a/drivers/rtc/rtc-ep93xx.c
+++ b/drivers/rtc/rtc-ep93xx.c
@@ -73,7 +73,7 @@ static int ep93xx_rtc_proc(struct device *dev, struct seq_file *seq)
73 return 0; 73 return 0;
74} 74}
75 75
76static struct rtc_class_ops ep93xx_rtc_ops = { 76static const struct rtc_class_ops ep93xx_rtc_ops = {
77 .read_time = ep93xx_rtc_read_time, 77 .read_time = ep93xx_rtc_read_time,
78 .set_time = ep93xx_rtc_set_time, 78 .set_time = ep93xx_rtc_set_time,
79 .set_mmss = ep93xx_rtc_set_mmss, 79 .set_mmss = ep93xx_rtc_set_mmss,
diff --git a/drivers/rtc/rtc-isl1208.c b/drivers/rtc/rtc-isl1208.c
index f324d0a635d4..1c743641b73b 100644
--- a/drivers/rtc/rtc-isl1208.c
+++ b/drivers/rtc/rtc-isl1208.c
@@ -390,7 +390,7 @@ static int isl1208_rtc_read_alarm(struct device *dev, struct rtc_wkalrm *alarm)
390 return isl1208_i2c_read_alarm(to_i2c_client(dev), alarm); 390 return isl1208_i2c_read_alarm(to_i2c_client(dev), alarm);
391} 391}
392 392
393static struct rtc_class_ops isl1208_rtc_ops = { 393static const struct rtc_class_ops isl1208_rtc_ops = {
394 .proc = isl1208_rtc_proc, 394 .proc = isl1208_rtc_proc,
395 .read_time = isl1208_rtc_read_time, 395 .read_time = isl1208_rtc_read_time,
396 .set_time = isl1208_rtc_set_time, 396 .set_time = isl1208_rtc_set_time,
diff --git a/drivers/rtc/rtc-m48t86.c b/drivers/rtc/rtc-m48t86.c
index 8c0d1a6739ad..8ff4a1221f59 100644
--- a/drivers/rtc/rtc-m48t86.c
+++ b/drivers/rtc/rtc-m48t86.c
@@ -138,7 +138,7 @@ static int m48t86_rtc_proc(struct device *dev, struct seq_file *seq)
138 return 0; 138 return 0;
139} 139}
140 140
141static struct rtc_class_ops m48t86_rtc_ops = { 141static const struct rtc_class_ops m48t86_rtc_ops = {
142 .read_time = m48t86_rtc_read_time, 142 .read_time = m48t86_rtc_read_time,
143 .set_time = m48t86_rtc_set_time, 143 .set_time = m48t86_rtc_set_time,
144 .proc = m48t86_rtc_proc, 144 .proc = m48t86_rtc_proc,
diff --git a/drivers/rtc/rtc-max6902.c b/drivers/rtc/rtc-max6902.c
index 2c9739562b5c..9eeef964663a 100644
--- a/drivers/rtc/rtc-max6902.c
+++ b/drivers/rtc/rtc-max6902.c
@@ -207,7 +207,7 @@ static int max6902_set_time(struct device *dev, struct rtc_time *tm)
207 return max6902_set_datetime(dev, tm); 207 return max6902_set_datetime(dev, tm);
208} 208}
209 209
210static struct rtc_class_ops max6902_rtc_ops = { 210static const struct rtc_class_ops max6902_rtc_ops = {
211 .read_time = max6902_read_time, 211 .read_time = max6902_read_time,
212 .set_time = max6902_set_time, 212 .set_time = max6902_set_time,
213}; 213};
diff --git a/drivers/rtc/rtc-pcf8563.c b/drivers/rtc/rtc-pcf8563.c
index bd4310643038..a760cf69af90 100644
--- a/drivers/rtc/rtc-pcf8563.c
+++ b/drivers/rtc/rtc-pcf8563.c
@@ -227,7 +227,7 @@ static int pcf8563_rtc_set_time(struct device *dev, struct rtc_time *tm)
227 return pcf8563_set_datetime(to_i2c_client(dev), tm); 227 return pcf8563_set_datetime(to_i2c_client(dev), tm);
228} 228}
229 229
230static struct rtc_class_ops pcf8563_rtc_ops = { 230static const struct rtc_class_ops pcf8563_rtc_ops = {
231 .read_time = pcf8563_rtc_read_time, 231 .read_time = pcf8563_rtc_read_time,
232 .set_time = pcf8563_rtc_set_time, 232 .set_time = pcf8563_rtc_set_time,
233}; 233};
diff --git a/drivers/rtc/rtc-pcf8583.c b/drivers/rtc/rtc-pcf8583.c
index b235a30cb661..5875ebb8c79d 100644
--- a/drivers/rtc/rtc-pcf8583.c
+++ b/drivers/rtc/rtc-pcf8583.c
@@ -273,7 +273,7 @@ static int pcf8583_rtc_set_time(struct device *dev, struct rtc_time *tm)
273 return ret; 273 return ret;
274} 274}
275 275
276static struct rtc_class_ops pcf8583_rtc_ops = { 276static const struct rtc_class_ops pcf8583_rtc_ops = {
277 .read_time = pcf8583_rtc_read_time, 277 .read_time = pcf8583_rtc_read_time,
278 .set_time = pcf8583_rtc_set_time, 278 .set_time = pcf8583_rtc_set_time,
279}; 279};
diff --git a/drivers/rtc/rtc-pl031.c b/drivers/rtc/rtc-pl031.c
index d6d1c5726b0e..739d1a6e14eb 100644
--- a/drivers/rtc/rtc-pl031.c
+++ b/drivers/rtc/rtc-pl031.c
@@ -128,7 +128,7 @@ static int pl031_set_alarm(struct device *dev, struct rtc_wkalrm *alarm)
128 return 0; 128 return 0;
129} 129}
130 130
131static struct rtc_class_ops pl031_ops = { 131static const struct rtc_class_ops pl031_ops = {
132 .open = pl031_open, 132 .open = pl031_open,
133 .release = pl031_release, 133 .release = pl031_release,
134 .ioctl = pl031_ioctl, 134 .ioctl = pl031_ioctl,
diff --git a/drivers/rtc/rtc-proc.c b/drivers/rtc/rtc-proc.c
index 2943d83edfd1..d51d8f20e634 100644
--- a/drivers/rtc/rtc-proc.c
+++ b/drivers/rtc/rtc-proc.c
@@ -23,7 +23,7 @@ static int rtc_proc_show(struct seq_file *seq, void *offset)
23{ 23{
24 int err; 24 int err;
25 struct class_device *class_dev = seq->private; 25 struct class_device *class_dev = seq->private;
26 struct rtc_class_ops *ops = to_rtc_device(class_dev)->ops; 26 const struct rtc_class_ops *ops = to_rtc_device(class_dev)->ops;
27 struct rtc_wkalrm alrm; 27 struct rtc_wkalrm alrm;
28 struct rtc_time tm; 28 struct rtc_time tm;
29 29
diff --git a/drivers/rtc/rtc-rs5c348.c b/drivers/rtc/rtc-rs5c348.c
index 25589061f931..f50f3fc353cd 100644
--- a/drivers/rtc/rtc-rs5c348.c
+++ b/drivers/rtc/rtc-rs5c348.c
@@ -140,7 +140,7 @@ rs5c348_rtc_read_time(struct device *dev, struct rtc_time *tm)
140 return 0; 140 return 0;
141} 141}
142 142
143static struct rtc_class_ops rs5c348_rtc_ops = { 143static const struct rtc_class_ops rs5c348_rtc_ops = {
144 .read_time = rs5c348_rtc_read_time, 144 .read_time = rs5c348_rtc_read_time,
145 .set_time = rs5c348_rtc_set_time, 145 .set_time = rs5c348_rtc_set_time,
146}; 146};
diff --git a/drivers/rtc/rtc-rs5c372.c b/drivers/rtc/rtc-rs5c372.c
index 7553d797603f..bbdad099471d 100644
--- a/drivers/rtc/rtc-rs5c372.c
+++ b/drivers/rtc/rtc-rs5c372.c
@@ -160,7 +160,7 @@ static int rs5c372_rtc_proc(struct device *dev, struct seq_file *seq)
160 return 0; 160 return 0;
161} 161}
162 162
163static struct rtc_class_ops rs5c372_rtc_ops = { 163static const struct rtc_class_ops rs5c372_rtc_ops = {
164 .proc = rs5c372_rtc_proc, 164 .proc = rs5c372_rtc_proc,
165 .read_time = rs5c372_rtc_read_time, 165 .read_time = rs5c372_rtc_read_time,
166 .set_time = rs5c372_rtc_set_time, 166 .set_time = rs5c372_rtc_set_time,
diff --git a/drivers/rtc/rtc-s3c.c b/drivers/rtc/rtc-s3c.c
index 2c7de79c83b9..625dad2eeb4f 100644
--- a/drivers/rtc/rtc-s3c.c
+++ b/drivers/rtc/rtc-s3c.c
@@ -386,7 +386,7 @@ static void s3c_rtc_release(struct device *dev)
386 free_irq(s3c_rtc_tickno, rtc_dev); 386 free_irq(s3c_rtc_tickno, rtc_dev);
387} 387}
388 388
389static struct rtc_class_ops s3c_rtcops = { 389static const struct rtc_class_ops s3c_rtcops = {
390 .open = s3c_rtc_open, 390 .open = s3c_rtc_open,
391 .release = s3c_rtc_release, 391 .release = s3c_rtc_release,
392 .ioctl = s3c_rtc_ioctl, 392 .ioctl = s3c_rtc_ioctl,
diff --git a/drivers/rtc/rtc-sa1100.c b/drivers/rtc/rtc-sa1100.c
index ee4b61ee67b0..439c41aea31c 100644
--- a/drivers/rtc/rtc-sa1100.c
+++ b/drivers/rtc/rtc-sa1100.c
@@ -303,7 +303,7 @@ static int sa1100_rtc_proc(struct device *dev, struct seq_file *seq)
303 return 0; 303 return 0;
304} 304}
305 305
306static struct rtc_class_ops sa1100_rtc_ops = { 306static const struct rtc_class_ops sa1100_rtc_ops = {
307 .open = sa1100_rtc_open, 307 .open = sa1100_rtc_open,
308 .read_callback = sa1100_rtc_read_callback, 308 .read_callback = sa1100_rtc_read_callback,
309 .release = sa1100_rtc_release, 309 .release = sa1100_rtc_release,
diff --git a/drivers/rtc/rtc-test.c b/drivers/rtc/rtc-test.c
index e1fa5fe7901f..bc4bd24508a2 100644
--- a/drivers/rtc/rtc-test.c
+++ b/drivers/rtc/rtc-test.c
@@ -75,7 +75,7 @@ static int test_rtc_ioctl(struct device *dev, unsigned int cmd,
75 } 75 }
76} 76}
77 77
78static struct rtc_class_ops test_rtc_ops = { 78static const struct rtc_class_ops test_rtc_ops = {
79 .proc = test_rtc_proc, 79 .proc = test_rtc_proc,
80 .read_time = test_rtc_read_time, 80 .read_time = test_rtc_read_time,
81 .set_time = test_rtc_set_time, 81 .set_time = test_rtc_set_time,
diff --git a/drivers/rtc/rtc-v3020.c b/drivers/rtc/rtc-v3020.c
index e28cc4b0901a..09b714f1cdc3 100644
--- a/drivers/rtc/rtc-v3020.c
+++ b/drivers/rtc/rtc-v3020.c
@@ -149,7 +149,7 @@ static int v3020_set_time(struct device *dev, struct rtc_time *dt)
149 return 0; 149 return 0;
150} 150}
151 151
152static struct rtc_class_ops v3020_rtc_ops = { 152static const struct rtc_class_ops v3020_rtc_ops = {
153 .read_time = v3020_read_time, 153 .read_time = v3020_read_time,
154 .set_time = v3020_set_time, 154 .set_time = v3020_set_time,
155}; 155};
diff --git a/drivers/rtc/rtc-vr41xx.c b/drivers/rtc/rtc-vr41xx.c
index 596764fd29f5..58e5ed0aa127 100644
--- a/drivers/rtc/rtc-vr41xx.c
+++ b/drivers/rtc/rtc-vr41xx.c
@@ -296,7 +296,7 @@ static irqreturn_t rtclong1_interrupt(int irq, void *dev_id, struct pt_regs *reg
296 return IRQ_HANDLED; 296 return IRQ_HANDLED;
297} 297}
298 298
299static struct rtc_class_ops vr41xx_rtc_ops = { 299static const struct rtc_class_ops vr41xx_rtc_ops = {
300 .release = vr41xx_rtc_release, 300 .release = vr41xx_rtc_release,
301 .ioctl = vr41xx_rtc_ioctl, 301 .ioctl = vr41xx_rtc_ioctl,
302 .read_time = vr41xx_rtc_read_time, 302 .read_time = vr41xx_rtc_read_time,
diff --git a/drivers/rtc/rtc-x1205.c b/drivers/rtc/rtc-x1205.c
index 788b6d1f8f2f..522c69753bbf 100644
--- a/drivers/rtc/rtc-x1205.c
+++ b/drivers/rtc/rtc-x1205.c
@@ -460,7 +460,7 @@ static int x1205_rtc_proc(struct device *dev, struct seq_file *seq)
460 return 0; 460 return 0;
461} 461}
462 462
463static struct rtc_class_ops x1205_rtc_ops = { 463static const struct rtc_class_ops x1205_rtc_ops = {
464 .proc = x1205_rtc_proc, 464 .proc = x1205_rtc_proc,
465 .read_time = x1205_rtc_read_time, 465 .read_time = x1205_rtc_read_time,
466 .set_time = x1205_rtc_set_time, 466 .set_time = x1205_rtc_set_time,
diff --git a/include/linux/rtc.h b/include/linux/rtc.h
index 5371e4e74595..b89f09357054 100644
--- a/include/linux/rtc.h
+++ b/include/linux/rtc.h
@@ -141,7 +141,7 @@ struct rtc_device
141 int id; 141 int id;
142 char name[RTC_DEVICE_NAME_SIZE]; 142 char name[RTC_DEVICE_NAME_SIZE];
143 143
144 struct rtc_class_ops *ops; 144 const struct rtc_class_ops *ops;
145 struct mutex ops_lock; 145 struct mutex ops_lock;
146 146
147 struct class_device *rtc_dev; 147 struct class_device *rtc_dev;
@@ -172,7 +172,7 @@ struct rtc_device
172 172
173extern struct rtc_device *rtc_device_register(const char *name, 173extern struct rtc_device *rtc_device_register(const char *name,
174 struct device *dev, 174 struct device *dev,
175 struct rtc_class_ops *ops, 175 const struct rtc_class_ops *ops,
176 struct module *owner); 176 struct module *owner);
177extern void rtc_device_unregister(struct rtc_device *rdev); 177extern void rtc_device_unregister(struct rtc_device *rdev);
178extern int rtc_interface_register(struct class_interface *intf); 178extern int rtc_interface_register(struct class_interface *intf);