The patch titled
constify rtc_class_ops: update drivers
has been added to the -mm tree. Its filename is
constify-rtc_class_ops-update-drivers.patch
See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find
out what to do about this
------------------------------------------------------
Subject: constify rtc_class_ops: update drivers
From: David Brownell <david-b@xxxxxxxxxxx>
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@xxxxxxxxxxxxxxxxxxxxx>
Cc: Alessandro Zummo <a.zummo@xxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
drivers/rtc/class.c | 2 +-
drivers/rtc/rtc-at91.c | 2 +-
drivers/rtc/rtc-dev.c | 4 ++--
drivers/rtc/rtc-ds1307.c | 2 +-
drivers/rtc/rtc-ds1553.c | 2 +-
drivers/rtc/rtc-ds1672.c | 2 +-
drivers/rtc/rtc-ds1742.c | 2 +-
drivers/rtc/rtc-ep93xx.c | 2 +-
drivers/rtc/rtc-isl1208.c | 2 +-
drivers/rtc/rtc-m48t86.c | 2 +-
drivers/rtc/rtc-max6902.c | 2 +-
drivers/rtc/rtc-pcf8563.c | 2 +-
drivers/rtc/rtc-pcf8583.c | 2 +-
drivers/rtc/rtc-pl031.c | 2 +-
drivers/rtc/rtc-proc.c | 2 +-
drivers/rtc/rtc-rs5c348.c | 2 +-
drivers/rtc/rtc-rs5c372.c | 2 +-
drivers/rtc/rtc-s3c.c | 2 +-
drivers/rtc/rtc-sa1100.c | 2 +-
drivers/rtc/rtc-test.c | 2 +-
drivers/rtc/rtc-v3020.c | 2 +-
drivers/rtc/rtc-vr41xx.c | 2 +-
drivers/rtc/rtc-x1205.c | 2 +-
include/linux/rtc.h | 4 ++--
24 files changed, 26 insertions(+), 26 deletions(-)
diff -puN drivers/rtc/class.c~constify-rtc_class_ops-update-drivers drivers/rtc/class.c
--- a/drivers/rtc/class.c~constify-rtc_class_ops-update-drivers
+++ a/drivers/rtc/class.c
@@ -39,7 +39,7 @@ static void rtc_device_release(struct cl
* Returns the pointer to the new struct class device.
*/
struct rtc_device *rtc_device_register(const char *name, struct device *dev,
- struct rtc_class_ops *ops,
+ const struct rtc_class_ops *ops,
struct module *owner)
{
struct rtc_device *rtc;
diff -puN drivers/rtc/rtc-at91.c~constify-rtc_class_ops-update-drivers drivers/rtc/rtc-at91.c
--- a/drivers/rtc/rtc-at91.c~constify-rtc_class_ops-update-drivers
+++ a/drivers/rtc/rtc-at91.c
@@ -267,7 +267,7 @@ static irqreturn_t at91_rtc_interrupt(in
return IRQ_NONE; /* not handled */
}
-static struct rtc_class_ops at91_rtc_ops = {
+static const struct rtc_class_ops at91_rtc_ops = {
.ioctl = at91_rtc_ioctl,
.read_time = at91_rtc_readtime,
.set_time = at91_rtc_settime,
diff -puN drivers/rtc/rtc-dev.c~constify-rtc_class_ops-update-drivers drivers/rtc/rtc-dev.c
--- a/drivers/rtc/rtc-dev.c~constify-rtc_class_ops-update-drivers
+++ a/drivers/rtc/rtc-dev.c
@@ -24,7 +24,7 @@ static int rtc_dev_open(struct inode *in
int err;
struct rtc_device *rtc = container_of(inode->i_cdev,
struct rtc_device, char_dev);
- struct rtc_class_ops *ops = rtc->ops;
+ const struct rtc_class_ops *ops = rtc->ops;
/* We keep the lock as long as the device is in use
* and return immediately if busy
@@ -209,7 +209,7 @@ static int rtc_dev_ioctl(struct inode *i
int err = 0;
struct class_device *class_dev = file->private_data;
struct rtc_device *rtc = to_rtc_device(class_dev);
- struct rtc_class_ops *ops = rtc->ops;
+ const struct rtc_class_ops *ops = rtc->ops;
struct rtc_time tm;
struct rtc_wkalrm alarm;
void __user *uarg = (void __user *) arg;
diff -puN drivers/rtc/rtc-ds1307.c~constify-rtc_class_ops-update-drivers drivers/rtc/rtc-ds1307.c
--- a/drivers/rtc/rtc-ds1307.c~constify-rtc_class_ops-update-drivers
+++ a/drivers/rtc/rtc-ds1307.c
@@ -178,7 +178,7 @@ static int ds1307_set_time(struct device
return 0;
}
-static struct rtc_class_ops ds13xx_rtc_ops = {
+static const struct rtc_class_ops ds13xx_rtc_ops = {
.read_time = ds1307_get_time,
.set_time = ds1307_set_time,
};
diff -puN drivers/rtc/rtc-ds1553.c~constify-rtc_class_ops-update-drivers drivers/rtc/rtc-ds1553.c
--- a/drivers/rtc/rtc-ds1553.c~constify-rtc_class_ops-update-drivers
+++ a/drivers/rtc/rtc-ds1553.c
@@ -250,7 +250,7 @@ static int ds1553_rtc_ioctl(struct devic
return 0;
}
-static struct rtc_class_ops ds1553_rtc_ops = {
+static const struct rtc_class_ops ds1553_rtc_ops = {
.read_time = ds1553_rtc_read_time,
.set_time = ds1553_rtc_set_time,
.read_alarm = ds1553_rtc_read_alarm,
diff -puN drivers/rtc/rtc-ds1672.c~constify-rtc_class_ops-update-drivers drivers/rtc/rtc-ds1672.c
--- a/drivers/rtc/rtc-ds1672.c~constify-rtc_class_ops-update-drivers
+++ a/drivers/rtc/rtc-ds1672.c
@@ -156,7 +156,7 @@ static ssize_t show_control(struct devic
}
static DEVICE_ATTR(control, S_IRUGO, show_control, NULL);
-static struct rtc_class_ops ds1672_rtc_ops = {
+static const struct rtc_class_ops ds1672_rtc_ops = {
.read_time = ds1672_rtc_read_time,
.set_time = ds1672_rtc_set_time,
.set_mmss = ds1672_rtc_set_mmss,
diff -puN drivers/rtc/rtc-ds1742.c~constify-rtc_class_ops-update-drivers drivers/rtc/rtc-ds1742.c
--- a/drivers/rtc/rtc-ds1742.c~constify-rtc_class_ops-update-drivers
+++ a/drivers/rtc/rtc-ds1742.c
@@ -116,7 +116,7 @@ static int ds1742_rtc_read_time(struct d
return 0;
}
-static struct rtc_class_ops ds1742_rtc_ops = {
+static const struct rtc_class_ops ds1742_rtc_ops = {
.read_time = ds1742_rtc_read_time,
.set_time = ds1742_rtc_set_time,
};
diff -puN drivers/rtc/rtc-ep93xx.c~constify-rtc_class_ops-update-drivers drivers/rtc/rtc-ep93xx.c
--- a/drivers/rtc/rtc-ep93xx.c~constify-rtc_class_ops-update-drivers
+++ a/drivers/rtc/rtc-ep93xx.c
@@ -73,7 +73,7 @@ static int ep93xx_rtc_proc(struct device
return 0;
}
-static struct rtc_class_ops ep93xx_rtc_ops = {
+static const struct rtc_class_ops ep93xx_rtc_ops = {
.read_time = ep93xx_rtc_read_time,
.set_time = ep93xx_rtc_set_time,
.set_mmss = ep93xx_rtc_set_mmss,
diff -puN drivers/rtc/rtc-isl1208.c~constify-rtc_class_ops-update-drivers drivers/rtc/rtc-isl1208.c
--- a/drivers/rtc/rtc-isl1208.c~constify-rtc_class_ops-update-drivers
+++ a/drivers/rtc/rtc-isl1208.c
@@ -390,7 +390,7 @@ static int isl1208_rtc_read_alarm(struct
return isl1208_i2c_read_alarm(to_i2c_client(dev), alarm);
}
-static struct rtc_class_ops isl1208_rtc_ops = {
+static const struct rtc_class_ops isl1208_rtc_ops = {
.proc = isl1208_rtc_proc,
.read_time = isl1208_rtc_read_time,
.set_time = isl1208_rtc_set_time,
diff -puN drivers/rtc/rtc-m48t86.c~constify-rtc_class_ops-update-drivers drivers/rtc/rtc-m48t86.c
--- a/drivers/rtc/rtc-m48t86.c~constify-rtc_class_ops-update-drivers
+++ a/drivers/rtc/rtc-m48t86.c
@@ -138,7 +138,7 @@ static int m48t86_rtc_proc(struct device
return 0;
}
-static struct rtc_class_ops m48t86_rtc_ops = {
+static const struct rtc_class_ops m48t86_rtc_ops = {
.read_time = m48t86_rtc_read_time,
.set_time = m48t86_rtc_set_time,
.proc = m48t86_rtc_proc,
diff -puN drivers/rtc/rtc-max6902.c~constify-rtc_class_ops-update-drivers drivers/rtc/rtc-max6902.c
--- a/drivers/rtc/rtc-max6902.c~constify-rtc_class_ops-update-drivers
+++ a/drivers/rtc/rtc-max6902.c
@@ -207,7 +207,7 @@ static int max6902_set_time(struct devic
return max6902_set_datetime(dev, tm);
}
-static struct rtc_class_ops max6902_rtc_ops = {
+static const struct rtc_class_ops max6902_rtc_ops = {
.read_time = max6902_read_time,
.set_time = max6902_set_time,
};
diff -puN drivers/rtc/rtc-pcf8563.c~constify-rtc_class_ops-update-drivers drivers/rtc/rtc-pcf8563.c
--- a/drivers/rtc/rtc-pcf8563.c~constify-rtc_class_ops-update-drivers
+++ a/drivers/rtc/rtc-pcf8563.c
@@ -227,7 +227,7 @@ static int pcf8563_rtc_set_time(struct d
return pcf8563_set_datetime(to_i2c_client(dev), tm);
}
-static struct rtc_class_ops pcf8563_rtc_ops = {
+static const struct rtc_class_ops pcf8563_rtc_ops = {
.read_time = pcf8563_rtc_read_time,
.set_time = pcf8563_rtc_set_time,
};
diff -puN drivers/rtc/rtc-pcf8583.c~constify-rtc_class_ops-update-drivers drivers/rtc/rtc-pcf8583.c
--- a/drivers/rtc/rtc-pcf8583.c~constify-rtc_class_ops-update-drivers
+++ a/drivers/rtc/rtc-pcf8583.c
@@ -273,7 +273,7 @@ static int pcf8583_rtc_set_time(struct d
return ret;
}
-static struct rtc_class_ops pcf8583_rtc_ops = {
+static const struct rtc_class_ops pcf8583_rtc_ops = {
.read_time = pcf8583_rtc_read_time,
.set_time = pcf8583_rtc_set_time,
};
diff -puN drivers/rtc/rtc-pl031.c~constify-rtc_class_ops-update-drivers drivers/rtc/rtc-pl031.c
--- a/drivers/rtc/rtc-pl031.c~constify-rtc_class_ops-update-drivers
+++ a/drivers/rtc/rtc-pl031.c
@@ -128,7 +128,7 @@ static int pl031_set_alarm(struct device
return 0;
}
-static struct rtc_class_ops pl031_ops = {
+static const struct rtc_class_ops pl031_ops = {
.open = pl031_open,
.release = pl031_release,
.ioctl = pl031_ioctl,
diff -puN drivers/rtc/rtc-proc.c~constify-rtc_class_ops-update-drivers drivers/rtc/rtc-proc.c
--- a/drivers/rtc/rtc-proc.c~constify-rtc_class_ops-update-drivers
+++ a/drivers/rtc/rtc-proc.c
@@ -23,7 +23,7 @@ static int rtc_proc_show(struct seq_file
{
int err;
struct class_device *class_dev = seq->private;
- struct rtc_class_ops *ops = to_rtc_device(class_dev)->ops;
+ const struct rtc_class_ops *ops = to_rtc_device(class_dev)->ops;
struct rtc_wkalrm alrm;
struct rtc_time tm;
diff -puN drivers/rtc/rtc-rs5c348.c~constify-rtc_class_ops-update-drivers drivers/rtc/rtc-rs5c348.c
--- a/drivers/rtc/rtc-rs5c348.c~constify-rtc_class_ops-update-drivers
+++ a/drivers/rtc/rtc-rs5c348.c
@@ -140,7 +140,7 @@ rs5c348_rtc_read_time(struct device *dev
return 0;
}
-static struct rtc_class_ops rs5c348_rtc_ops = {
+static const struct rtc_class_ops rs5c348_rtc_ops = {
.read_time = rs5c348_rtc_read_time,
.set_time = rs5c348_rtc_set_time,
};
diff -puN drivers/rtc/rtc-rs5c372.c~constify-rtc_class_ops-update-drivers drivers/rtc/rtc-rs5c372.c
--- a/drivers/rtc/rtc-rs5c372.c~constify-rtc_class_ops-update-drivers
+++ a/drivers/rtc/rtc-rs5c372.c
@@ -160,7 +160,7 @@ static int rs5c372_rtc_proc(struct devic
return 0;
}
-static struct rtc_class_ops rs5c372_rtc_ops = {
+static const struct rtc_class_ops rs5c372_rtc_ops = {
.proc = rs5c372_rtc_proc,
.read_time = rs5c372_rtc_read_time,
.set_time = rs5c372_rtc_set_time,
diff -puN drivers/rtc/rtc-s3c.c~constify-rtc_class_ops-update-drivers drivers/rtc/rtc-s3c.c
--- a/drivers/rtc/rtc-s3c.c~constify-rtc_class_ops-update-drivers
+++ a/drivers/rtc/rtc-s3c.c
@@ -386,7 +386,7 @@ static void s3c_rtc_release(struct devic
free_irq(s3c_rtc_tickno, rtc_dev);
}
-static struct rtc_class_ops s3c_rtcops = {
+static const struct rtc_class_ops s3c_rtcops = {
.open = s3c_rtc_open,
.release = s3c_rtc_release,
.ioctl = s3c_rtc_ioctl,
diff -puN drivers/rtc/rtc-sa1100.c~constify-rtc_class_ops-update-drivers drivers/rtc/rtc-sa1100.c
--- a/drivers/rtc/rtc-sa1100.c~constify-rtc_class_ops-update-drivers
+++ a/drivers/rtc/rtc-sa1100.c
@@ -303,7 +303,7 @@ static int sa1100_rtc_proc(struct device
return 0;
}
-static struct rtc_class_ops sa1100_rtc_ops = {
+static const struct rtc_class_ops sa1100_rtc_ops = {
.open = sa1100_rtc_open,
.read_callback = sa1100_rtc_read_callback,
.release = sa1100_rtc_release,
diff -puN drivers/rtc/rtc-test.c~constify-rtc_class_ops-update-drivers drivers/rtc/rtc-test.c
--- a/drivers/rtc/rtc-test.c~constify-rtc_class_ops-update-drivers
+++ a/drivers/rtc/rtc-test.c
@@ -75,7 +75,7 @@ static int test_rtc_ioctl(struct device
}
}
-static struct rtc_class_ops test_rtc_ops = {
+static const struct rtc_class_ops test_rtc_ops = {
.proc = test_rtc_proc,
.read_time = test_rtc_read_time,
.set_time = test_rtc_set_time,
diff -puN drivers/rtc/rtc-v3020.c~constify-rtc_class_ops-update-drivers drivers/rtc/rtc-v3020.c
--- a/drivers/rtc/rtc-v3020.c~constify-rtc_class_ops-update-drivers
+++ a/drivers/rtc/rtc-v3020.c
@@ -149,7 +149,7 @@ static int v3020_set_time(struct device
return 0;
}
-static struct rtc_class_ops v3020_rtc_ops = {
+static const struct rtc_class_ops v3020_rtc_ops = {
.read_time = v3020_read_time,
.set_time = v3020_set_time,
};
diff -puN drivers/rtc/rtc-vr41xx.c~constify-rtc_class_ops-update-drivers drivers/rtc/rtc-vr41xx.c
--- a/drivers/rtc/rtc-vr41xx.c~constify-rtc_class_ops-update-drivers
+++ a/drivers/rtc/rtc-vr41xx.c
@@ -296,7 +296,7 @@ static irqreturn_t rtclong1_interrupt(in
return IRQ_HANDLED;
}
-static struct rtc_class_ops vr41xx_rtc_ops = {
+static const struct rtc_class_ops vr41xx_rtc_ops = {
.release = vr41xx_rtc_release,
.ioctl = vr41xx_rtc_ioctl,
.read_time = vr41xx_rtc_read_time,
diff -puN drivers/rtc/rtc-x1205.c~constify-rtc_class_ops-update-drivers drivers/rtc/rtc-x1205.c
--- a/drivers/rtc/rtc-x1205.c~constify-rtc_class_ops-update-drivers
+++ a/drivers/rtc/rtc-x1205.c
@@ -460,7 +460,7 @@ static int x1205_rtc_proc(struct device
return 0;
}
-static struct rtc_class_ops x1205_rtc_ops = {
+static const struct rtc_class_ops x1205_rtc_ops = {
.proc = x1205_rtc_proc,
.read_time = x1205_rtc_read_time,
.set_time = x1205_rtc_set_time,
diff -puN include/linux/rtc.h~constify-rtc_class_ops-update-drivers include/linux/rtc.h
--- a/include/linux/rtc.h~constify-rtc_class_ops-update-drivers
+++ a/include/linux/rtc.h
@@ -141,7 +141,7 @@ struct rtc_device
int id;
char name[RTC_DEVICE_NAME_SIZE];
- struct rtc_class_ops *ops;
+ const struct rtc_class_ops *ops;
struct mutex ops_lock;
struct class_device *rtc_dev;
@@ -172,7 +172,7 @@ struct rtc_device
extern struct rtc_device *rtc_device_register(const char *name,
struct device *dev,
- struct rtc_class_ops *ops,
+ const struct rtc_class_ops *ops,
struct module *owner);
extern void rtc_device_unregister(struct rtc_device *rdev);
extern int rtc_interface_register(struct class_interface *intf);
_
Patches currently in -mm which might be from david-b@xxxxxxxxxxx are
origin.patch
i2c-tps65010-update-for-current-i2c-omap.patch
git-pcmcia.patch
rtc-class-kconfig-improvements.patch
rtc-class-uses-subsys_init.patch
rtc-class-error-checks.patch
constify-rtc_class_ops-update-drivers.patch
at91rm9200-rtc-can-issue-system-wakeup-events.patch
omap_cf-works-again-sync-with-linux-omap-tree.patch
ide-reprogram-disk-pio-timings-on-resume.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
