Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

rtc: rtc interfaces don't use class_device

Browse source 
This patch removes class_device from the programming interface that the RTC
framework exposes to the rest of the kernel.  Now an rtc_device is passed,
which is more type-safe and streamlines all the relevant code.

Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>
Acked-by: Greg Kroah-Hartman <gregkh@suse.de>
Acked-By: Alessandro Zummo <a.zummo@towertech.it>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
David Brownell 2007-05-08 00:33:30 -07:00 committed by Linus Torvalds
parent 5726fb2012
commit ab6a2d70d1
17 changed files with 119 additions and 118 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
drivers/rtc/hctosys.c
View file

@ -26,15 +26,15 @@ static int __init rtc_hctosys(void)
{ {
int err; int err;
struct rtc_time tm; struct rtc_time tm;
struct class_device *class_dev = rtc_class_open(CONFIG_RTC_HCTOSYS_DEVICE); struct rtc_device *rtc = rtc_class_open(CONFIG_RTC_HCTOSYS_DEVICE);
if (class_dev == NULL) { if (rtc == NULL) {
printk("%s: unable to open rtc device (%s)\n", printk("%s: unable to open rtc device (%s)\n",
__FILE__, CONFIG_RTC_HCTOSYS_DEVICE); __FILE__, CONFIG_RTC_HCTOSYS_DEVICE);
return -ENODEV; return -ENODEV;
} }
err = rtc_read_time(class_dev, &tm); err = rtc_read_time(rtc, &tm);
if (err == 0) { if (err == 0) {
err = rtc_valid_tm(&tm); err = rtc_valid_tm(&tm);
if (err == 0) { if (err == 0) {
@ -46,7 +46,7 @@ static int __init rtc_hctosys(void)
do_settimeofday(&tv); do_settimeofday(&tv);
dev_info(class_dev->dev, dev_info(rtc->class_dev.dev,
"setting the system clock to " "setting the system clock to "
"%d-%02d-%02d %02d:%02d:%02d (%u)\n", "%d-%02d-%02d %02d:%02d:%02d (%u)\n",
tm.tm_year + 1900, tm.tm_mon + 1, tm.tm_mday, tm.tm_year + 1900, tm.tm_mon + 1, tm.tm_mday,
@ -54,14 +54,14 @@ static int __init rtc_hctosys(void)
(unsigned int) tv.tv_sec); (unsigned int) tv.tv_sec);
} }
else else
dev_err(class_dev->dev, dev_err(rtc->class_dev.dev,
"hctosys: invalid date/time\n"); "hctosys: invalid date/time\n");
} }
else else
dev_err(class_dev->dev, dev_err(rtc->class_dev.dev,
"hctosys: unable to read the hardware clock\n"); "hctosys: unable to read the hardware clock\n");
rtc_class_close(class_dev); rtc_class_close(rtc);
return 0; return 0;
} }

78
drivers/rtc/interface.c
View file

@ -13,10 +13,9 @@
#include <linux/rtc.h> #include <linux/rtc.h>
int rtc_read_time(struct class_device *class_dev, struct rtc_time *tm) int rtc_read_time(struct rtc_device *rtc, struct rtc_time *tm)
{ {
int err; int err;
struct rtc_device *rtc = to_rtc_device(class_dev);
err = mutex_lock_interruptible(&rtc->ops_lock); err = mutex_lock_interruptible(&rtc->ops_lock);
if (err) if (err)
@ -28,7 +27,7 @@ int rtc_read_time(struct class_device *class_dev, struct rtc_time *tm)
err = -EINVAL; err = -EINVAL;
else { else {
memset(tm, 0, sizeof(struct rtc_time)); memset(tm, 0, sizeof(struct rtc_time));
err = rtc->ops->read_time(class_dev->dev, tm); err = rtc->ops->read_time(rtc->class_dev.dev, tm);
} }
mutex_unlock(&rtc->ops_lock); mutex_unlock(&rtc->ops_lock);
@ -36,10 +35,9 @@ int rtc_read_time(struct class_device *class_dev, struct rtc_time *tm)
} }
EXPORT_SYMBOL_GPL(rtc_read_time); EXPORT_SYMBOL_GPL(rtc_read_time);
int rtc_set_time(struct class_device *class_dev, struct rtc_time *tm) int rtc_set_time(struct rtc_device *rtc, struct rtc_time *tm)
{ {
int err; int err;
struct rtc_device *rtc = to_rtc_device(class_dev);
err = rtc_valid_tm(tm); err = rtc_valid_tm(tm);
if (err != 0) if (err != 0)
@ -54,17 +52,16 @@ int rtc_set_time(struct class_device *class_dev, struct rtc_time *tm)
else if (!rtc->ops->set_time) else if (!rtc->ops->set_time)
err = -EINVAL; err = -EINVAL;
else else
err = rtc->ops->set_time(class_dev->dev, tm); err = rtc->ops->set_time(rtc->class_dev.dev, tm);
mutex_unlock(&rtc->ops_lock); mutex_unlock(&rtc->ops_lock);
return err; return err;
} }
EXPORT_SYMBOL_GPL(rtc_set_time); EXPORT_SYMBOL_GPL(rtc_set_time);
int rtc_set_mmss(struct class_device *class_dev, unsigned long secs) int rtc_set_mmss(struct rtc_device *rtc, unsigned long secs)
{ {
int err; int err;
struct rtc_device *rtc = to_rtc_device(class_dev);
err = mutex_lock_interruptible(&rtc->ops_lock); err = mutex_lock_interruptible(&rtc->ops_lock);
if (err) if (err)
@ -73,11 +70,11 @@ int rtc_set_mmss(struct class_device *class_dev, unsigned long secs)
if (!rtc->ops) if (!rtc->ops)
err = -ENODEV; err = -ENODEV;
else if (rtc->ops->set_mmss) else if (rtc->ops->set_mmss)
err = rtc->ops->set_mmss(class_dev->dev, secs); err = rtc->ops->set_mmss(rtc->class_dev.dev, secs);
else if (rtc->ops->read_time && rtc->ops->set_time) { else if (rtc->ops->read_time && rtc->ops->set_time) {
struct rtc_time new, old; struct rtc_time new, old;
err = rtc->ops->read_time(class_dev->dev, &old); err = rtc->ops->read_time(rtc->class_dev.dev, &old);
if (err == 0) { if (err == 0) {
rtc_time_to_tm(secs, &new); rtc_time_to_tm(secs, &new);
@ -89,7 +86,8 @@ int rtc_set_mmss(struct class_device *class_dev, unsigned long secs)
*/ */
if (!((old.tm_hour == 23 && old.tm_min == 59) || if (!((old.tm_hour == 23 && old.tm_min == 59) ||
(new.tm_hour == 23 && new.tm_min == 59))) (new.tm_hour == 23 && new.tm_min == 59)))
err = rtc->ops->set_time(class_dev->dev, &new); err = rtc->ops->set_time(rtc->class_dev.dev,
&new);
} }
} }
else else
@ -101,10 +99,9 @@ int rtc_set_mmss(struct class_device *class_dev, unsigned long secs)
} }
EXPORT_SYMBOL_GPL(rtc_set_mmss); EXPORT_SYMBOL_GPL(rtc_set_mmss);
int rtc_read_alarm(struct class_device *class_dev, struct rtc_wkalrm *alarm) int rtc_read_alarm(struct rtc_device *rtc, struct rtc_wkalrm *alarm)
{ {
int err; int err;
struct rtc_device *rtc = to_rtc_device(class_dev);
err = mutex_lock_interruptible(&rtc->ops_lock); err = mutex_lock_interruptible(&rtc->ops_lock);
if (err) if (err)
@ -116,7 +113,7 @@ int rtc_read_alarm(struct class_device *class_dev, struct rtc_wkalrm *alarm)
err = -EINVAL; err = -EINVAL;
else { else {
memset(alarm, 0, sizeof(struct rtc_wkalrm)); memset(alarm, 0, sizeof(struct rtc_wkalrm));
err = rtc->ops->read_alarm(class_dev->dev, alarm); err = rtc->ops->read_alarm(rtc->class_dev.dev, alarm);
} }
mutex_unlock(&rtc->ops_lock); mutex_unlock(&rtc->ops_lock);
@ -124,10 +121,9 @@ int rtc_read_alarm(struct class_device *class_dev, struct rtc_wkalrm *alarm)
} }
EXPORT_SYMBOL_GPL(rtc_read_alarm); EXPORT_SYMBOL_GPL(rtc_read_alarm);
int rtc_set_alarm(struct class_device *class_dev, struct rtc_wkalrm *alarm) int rtc_set_alarm(struct rtc_device *rtc, struct rtc_wkalrm *alarm)
{ {
int err; int err;
struct rtc_device *rtc = to_rtc_device(class_dev);
err = mutex_lock_interruptible(&rtc->ops_lock); err = mutex_lock_interruptible(&rtc->ops_lock);
if (err) if (err)
@ -138,7 +134,7 @@ int rtc_set_alarm(struct class_device *class_dev, struct rtc_wkalrm *alarm)
else if (!rtc->ops->set_alarm) else if (!rtc->ops->set_alarm)
err = -EINVAL; err = -EINVAL;
else else
err = rtc->ops->set_alarm(class_dev->dev, alarm); err = rtc->ops->set_alarm(rtc->class_dev.dev, alarm);
mutex_unlock(&rtc->ops_lock); mutex_unlock(&rtc->ops_lock);
return err; return err;
@ -147,16 +143,14 @@ EXPORT_SYMBOL_GPL(rtc_set_alarm);
/** /**
* rtc_update_irq - report RTC periodic, alarm, and/or update irqs * rtc_update_irq - report RTC periodic, alarm, and/or update irqs
* @class_dev: the rtc's class device * @rtc: the rtc device
* @num: how many irqs are being reported (usually one) * @num: how many irqs are being reported (usually one)
* @events: mask of RTC_IRQF with one or more of RTC_PF, RTC_AF, RTC_UF * @events: mask of RTC_IRQF with one or more of RTC_PF, RTC_AF, RTC_UF
* Context: in_interrupt(), irqs blocked * Context: in_interrupt(), irqs blocked
*/ */
void rtc_update_irq(struct class_device *class_dev, void rtc_update_irq(struct rtc_device *rtc,
unsigned long num, unsigned long events) unsigned long num, unsigned long events)
{ {
struct rtc_device *rtc = to_rtc_device(class_dev);
spin_lock(&rtc->irq_lock); spin_lock(&rtc->irq_lock);
rtc->irq_data = (rtc->irq_data + (num << 8)) | events; rtc->irq_data = (rtc->irq_data + (num << 8)) | events;
spin_unlock(&rtc->irq_lock); spin_unlock(&rtc->irq_lock);
@ -171,40 +165,43 @@ void rtc_update_irq(struct class_device *class_dev,
} }
EXPORT_SYMBOL_GPL(rtc_update_irq); EXPORT_SYMBOL_GPL(rtc_update_irq);
struct class_device *rtc_class_open(char *name) struct rtc_device *rtc_class_open(char *name)
{ {
struct class_device *class_dev = NULL, struct class_device *class_dev_tmp;
*class_dev_tmp; struct rtc_device *rtc = NULL;
down(&rtc_class->sem); down(&rtc_class->sem);
list_for_each_entry(class_dev_tmp, &rtc_class->children, node) { list_for_each_entry(class_dev_tmp, &rtc_class->children, node) {
if (strncmp(class_dev_tmp->class_id, name, BUS_ID_SIZE) == 0) { if (strncmp(class_dev_tmp->class_id, name, BUS_ID_SIZE) == 0) {
class_dev = class_device_get(class_dev_tmp); class_dev_tmp = class_device_get(class_dev_tmp);
if (class_dev_tmp)
rtc = to_rtc_device(class_dev_tmp);
break; break;
} }
} }
if (class_dev) { if (rtc) {
if (!try_module_get(to_rtc_device(class_dev)->owner)) if (!try_module_get(rtc->owner)) {
class_dev = NULL; class_device_put(class_dev_tmp);
rtc = NULL;
}
} }
up(&rtc_class->sem); up(&rtc_class->sem);
return class_dev; return rtc;
} }
EXPORT_SYMBOL_GPL(rtc_class_open); EXPORT_SYMBOL_GPL(rtc_class_open);
void rtc_class_close(struct class_device *class_dev) void rtc_class_close(struct rtc_device *rtc)
{ {
module_put(to_rtc_device(class_dev)->owner); module_put(rtc->owner);
class_device_put(class_dev); class_device_put(&rtc->class_dev);
} }
EXPORT_SYMBOL_GPL(rtc_class_close); EXPORT_SYMBOL_GPL(rtc_class_close);
int rtc_irq_register(struct class_device *class_dev, struct rtc_task *task) int rtc_irq_register(struct rtc_device *rtc, struct rtc_task *task)
{ {
int retval = -EBUSY; int retval = -EBUSY;
struct rtc_device *rtc = to_rtc_device(class_dev);
if (task == NULL || task->func == NULL) if (task == NULL || task->func == NULL)
return -EINVAL; return -EINVAL;
@ -220,9 +217,8 @@ int rtc_irq_register(struct class_device *class_dev, struct rtc_task *task)
} }
EXPORT_SYMBOL_GPL(rtc_irq_register); EXPORT_SYMBOL_GPL(rtc_irq_register);
void rtc_irq_unregister(struct class_device *class_dev, struct rtc_task *task) void rtc_irq_unregister(struct rtc_device *rtc, struct rtc_task *task)
{ {
struct rtc_device *rtc = to_rtc_device(class_dev);
spin_lock_irq(&rtc->irq_task_lock); spin_lock_irq(&rtc->irq_task_lock);
if (rtc->irq_task == task) if (rtc->irq_task == task)
@ -231,11 +227,10 @@ void rtc_irq_unregister(struct class_device *class_dev, struct rtc_task *task)
} }
EXPORT_SYMBOL_GPL(rtc_irq_unregister); EXPORT_SYMBOL_GPL(rtc_irq_unregister);
int rtc_irq_set_state(struct class_device *class_dev, struct rtc_task *task, int enabled) int rtc_irq_set_state(struct rtc_device *rtc, struct rtc_task *task, int enabled)
{ {
int err = 0; int err = 0;
unsigned long flags; unsigned long flags;
struct rtc_device *rtc = to_rtc_device(class_dev);
if (rtc->ops->irq_set_state == NULL) if (rtc->ops->irq_set_state == NULL)
return -ENXIO; return -ENXIO;
@ -246,17 +241,16 @@ int rtc_irq_set_state(struct class_device *class_dev, struct rtc_task *task, int
spin_unlock_irqrestore(&rtc->irq_task_lock, flags); spin_unlock_irqrestore(&rtc->irq_task_lock, flags);
if (err == 0) if (err == 0)
err = rtc->ops->irq_set_state(class_dev->dev, enabled); err = rtc->ops->irq_set_state(rtc->class_dev.dev, enabled);
return err; return err;
} }
EXPORT_SYMBOL_GPL(rtc_irq_set_state); EXPORT_SYMBOL_GPL(rtc_irq_set_state);
int rtc_irq_set_freq(struct class_device *class_dev, struct rtc_task *task, int freq) int rtc_irq_set_freq(struct rtc_device *rtc, struct rtc_task *task, int freq)
{ {
int err = 0; int err = 0;
unsigned long flags; unsigned long flags;
struct rtc_device *rtc = to_rtc_device(class_dev);
if (rtc->ops->irq_set_freq == NULL) if (rtc->ops->irq_set_freq == NULL)
return -ENXIO; return -ENXIO;
@ -267,7 +261,7 @@ int rtc_irq_set_freq(struct class_device *class_dev, struct rtc_task *task, int
spin_unlock_irqrestore(&rtc->irq_task_lock, flags); spin_unlock_irqrestore(&rtc->irq_task_lock, flags);
if (err == 0) { if (err == 0) {
err = rtc->ops->irq_set_freq(class_dev->dev, freq); err = rtc->ops->irq_set_freq(rtc->class_dev.dev, freq);
if (err == 0) if (err == 0)
rtc->irq_freq = freq; rtc->irq_freq = freq;
} }

2
drivers/rtc/rtc-at91rm9200.c
View file

@ -263,7 +263,7 @@ static irqreturn_t at91_rtc_interrupt(int irq, void *dev_id)
at91_sys_write(AT91_RTC_SCCR, rtsr); /* clear status reg */ at91_sys_write(AT91_RTC_SCCR, rtsr); /* clear status reg */
rtc_update_irq(&rtc->class_dev, 1, events); rtc_update_irq(rtc, 1, events);
pr_debug("%s(): num=%ld, events=0x%02lx\n", __FUNCTION__, pr_debug("%s(): num=%ld, events=0x%02lx\n", __FUNCTION__,
events >> 8, events & 0x000000FF); events >> 8, events & 0x000000FF);

12
drivers/rtc/rtc-cmos.c
View file

@ -203,7 +203,7 @@ static int cmos_set_alarm(struct device *dev, struct rtc_wkalrm *t)
rtc_intr = CMOS_READ(RTC_INTR_FLAGS); rtc_intr = CMOS_READ(RTC_INTR_FLAGS);
rtc_intr &= (rtc_control & RTC_IRQMASK) | RTC_IRQF; rtc_intr &= (rtc_control & RTC_IRQMASK) | RTC_IRQF;
if (is_intr(rtc_intr)) if (is_intr(rtc_intr))
rtc_update_irq(&cmos->rtc->class_dev, 1, rtc_intr); rtc_update_irq(cmos->rtc, 1, rtc_intr);
/* update alarm */ /* update alarm */
CMOS_WRITE(hrs, RTC_HOURS_ALARM); CMOS_WRITE(hrs, RTC_HOURS_ALARM);
@ -223,7 +223,7 @@ static int cmos_set_alarm(struct device *dev, struct rtc_wkalrm *t)
rtc_intr = CMOS_READ(RTC_INTR_FLAGS); rtc_intr = CMOS_READ(RTC_INTR_FLAGS);
rtc_intr &= (rtc_control & RTC_IRQMASK) | RTC_IRQF; rtc_intr &= (rtc_control & RTC_IRQMASK) | RTC_IRQF;
if (is_intr(rtc_intr)) if (is_intr(rtc_intr))
rtc_update_irq(&cmos->rtc->class_dev, 1, rtc_intr); rtc_update_irq(cmos->rtc, 1, rtc_intr);
} }
spin_unlock_irq(&rtc_lock); spin_unlock_irq(&rtc_lock);
@ -304,7 +304,7 @@ cmos_rtc_ioctl(struct device *dev, unsigned int cmd, unsigned long arg)
rtc_intr = CMOS_READ(RTC_INTR_FLAGS); rtc_intr = CMOS_READ(RTC_INTR_FLAGS);
rtc_intr &= (rtc_control & RTC_IRQMASK) | RTC_IRQF; rtc_intr &= (rtc_control & RTC_IRQMASK) | RTC_IRQF;
if (is_intr(rtc_intr)) if (is_intr(rtc_intr))
rtc_update_irq(&cmos->rtc->class_dev, 1, rtc_intr); rtc_update_irq(cmos->rtc, 1, rtc_intr);
spin_unlock_irqrestore(&rtc_lock, flags); spin_unlock_irqrestore(&rtc_lock, flags);
return 0; return 0;
} }
@ -471,7 +471,7 @@ cmos_do_probe(struct device *dev, struct resource *ports, int rtc_irq)
if (is_valid_irq(rtc_irq)) if (is_valid_irq(rtc_irq))
retval = request_irq(rtc_irq, cmos_interrupt, IRQF_DISABLED, retval = request_irq(rtc_irq, cmos_interrupt, IRQF_DISABLED,
cmos_rtc.rtc->class_dev.class_id, cmos_rtc.rtc->class_dev.class_id,
&cmos_rtc.rtc->class_dev); cmos_rtc.rtc);
if (retval < 0) { if (retval < 0) {
dev_dbg(dev, "IRQ %d is already in use\n", rtc_irq); dev_dbg(dev, "IRQ %d is already in use\n", rtc_irq);
goto cleanup1; goto cleanup1;
@ -555,7 +555,7 @@ static int cmos_suspend(struct device *dev, pm_message_t mesg)
irqstat = CMOS_READ(RTC_INTR_FLAGS); irqstat = CMOS_READ(RTC_INTR_FLAGS);
irqstat &= (tmp & RTC_IRQMASK) | RTC_IRQF; irqstat &= (tmp & RTC_IRQMASK) | RTC_IRQF;
if (is_intr(irqstat)) if (is_intr(irqstat))
rtc_update_irq(&cmos->rtc->class_dev, 1, irqstat); rtc_update_irq(cmos->rtc, 1, irqstat);
} }
spin_unlock_irq(&rtc_lock); spin_unlock_irq(&rtc_lock);
@ -590,7 +590,7 @@ static int cmos_resume(struct device *dev)
tmp = CMOS_READ(RTC_INTR_FLAGS); tmp = CMOS_READ(RTC_INTR_FLAGS);
tmp &= (cmos->suspend_ctrl & RTC_IRQMASK) | RTC_IRQF; tmp &= (cmos->suspend_ctrl & RTC_IRQMASK) | RTC_IRQF;
if (is_intr(tmp)) if (is_intr(tmp))
rtc_update_irq(&cmos->rtc->class_dev, 1, tmp); rtc_update_irq(cmos->rtc, 1, tmp);
spin_unlock_irq(&rtc_lock); spin_unlock_irq(&rtc_lock);
} }

2
drivers/rtc/rtc-core.h
View file

@ -1,3 +1,5 @@
extern int rtc_interface_register(struct class_interface *intf);
#ifdef CONFIG_RTC_INTF_DEV #ifdef CONFIG_RTC_INTF_DEV
extern void __init rtc_dev_init(void); extern void __init rtc_dev_init(void);

27
drivers/rtc/rtc-dev.c
View file

@ -32,7 +32,7 @@ static int rtc_dev_open(struct inode *inode, struct file *file)
if (!(mutex_trylock(&rtc->char_lock))) if (!(mutex_trylock(&rtc->char_lock)))
return -EBUSY; return -EBUSY;
file->private_data = &rtc->class_dev; file->private_data = rtc;
err = ops->open ? ops->open(rtc->class_dev.dev) : 0; err = ops->open ? ops->open(rtc->class_dev.dev) : 0;
if (err == 0) { if (err == 0) {
@ -61,7 +61,7 @@ static void rtc_uie_task(struct work_struct *work)
int num = 0; int num = 0;
int err; int err;
err = rtc_read_time(&rtc->class_dev, &tm); err = rtc_read_time(rtc, &tm);
local_irq_disable(); local_irq_disable();
spin_lock(&rtc->irq_lock); spin_lock(&rtc->irq_lock);
@ -79,7 +79,7 @@ static void rtc_uie_task(struct work_struct *work)
} }
spin_unlock(&rtc->irq_lock); spin_unlock(&rtc->irq_lock);
if (num) if (num)
rtc_update_irq(&rtc->class_dev, num, RTC_UF | RTC_IRQF); rtc_update_irq(rtc, num, RTC_UF | RTC_IRQF);
local_irq_enable(); local_irq_enable();
} }
static void rtc_uie_timer(unsigned long data) static void rtc_uie_timer(unsigned long data)
@ -121,7 +121,7 @@ static int set_uie(struct rtc_device *rtc)
struct rtc_time tm; struct rtc_time tm;
int err; int err;
err = rtc_read_time(&rtc->class_dev, &tm); err = rtc_read_time(rtc, &tm);
if (err) if (err)
return err; return err;
spin_lock_irq(&rtc->irq_lock); spin_lock_irq(&rtc->irq_lock);
@ -210,8 +210,7 @@ static int rtc_dev_ioctl(struct inode *inode, struct file *file,
unsigned int cmd, unsigned long arg) unsigned int cmd, unsigned long arg)
{ {
int err = 0; int err = 0;
struct class_device *class_dev = file->private_data; struct rtc_device *rtc = file->private_data;
struct rtc_device *rtc = to_rtc_device(class_dev);
const struct rtc_class_ops *ops = rtc->ops; const struct rtc_class_ops *ops = rtc->ops;
struct rtc_time tm; struct rtc_time tm;
struct rtc_wkalrm alarm; struct rtc_wkalrm alarm;
@ -252,7 +251,7 @@ static int rtc_dev_ioctl(struct inode *inode, struct file *file,
/* try the driver's ioctl interface */ /* try the driver's ioctl interface */
if (ops->ioctl) { if (ops->ioctl) {
err = ops->ioctl(class_dev->dev, cmd, arg); err = ops->ioctl(rtc->class_dev.dev, cmd, arg);
if (err != -ENOIOCTLCMD) if (err != -ENOIOCTLCMD)
return err; return err;
} }
@ -264,7 +263,7 @@ static int rtc_dev_ioctl(struct inode *inode, struct file *file,
switch (cmd) { switch (cmd) {
case RTC_ALM_READ: case RTC_ALM_READ:
err = rtc_read_alarm(class_dev, &alarm); err = rtc_read_alarm(rtc, &alarm);
if (err < 0) if (err < 0)
return err; return err;
@ -284,11 +283,11 @@ static int rtc_dev_ioctl(struct inode *inode, struct file *file,
alarm.time.tm_wday = -1; alarm.time.tm_wday = -1;
alarm.time.tm_yday = -1; alarm.time.tm_yday = -1;
alarm.time.tm_isdst = -1; alarm.time.tm_isdst = -1;
err = rtc_set_alarm(class_dev, &alarm); err = rtc_set_alarm(rtc, &alarm);
break; break;
case RTC_RD_TIME: case RTC_RD_TIME:
err = rtc_read_time(class_dev, &tm); err = rtc_read_time(rtc, &tm);
if (err < 0) if (err < 0)
return err; return err;
@ -300,7 +299,7 @@ static int rtc_dev_ioctl(struct inode *inode, struct file *file,
if (copy_from_user(&tm, uarg, sizeof(tm))) if (copy_from_user(&tm, uarg, sizeof(tm)))
return -EFAULT; return -EFAULT;
err = rtc_set_time(class_dev, &tm); err = rtc_set_time(rtc, &tm);
break; break;
case RTC_IRQP_READ: case RTC_IRQP_READ:
@ -310,7 +309,7 @@ static int rtc_dev_ioctl(struct inode *inode, struct file *file,
case RTC_IRQP_SET: case RTC_IRQP_SET:
if (ops->irq_set_freq) if (ops->irq_set_freq)
err = rtc_irq_set_freq(class_dev, rtc->irq_task, arg); err = rtc_irq_set_freq(rtc, rtc->irq_task, arg);
break; break;
#if 0 #if 0
@ -336,11 +335,11 @@ static int rtc_dev_ioctl(struct inode *inode, struct file *file,
if (copy_from_user(&alarm, uarg, sizeof(alarm))) if (copy_from_user(&alarm, uarg, sizeof(alarm)))
return -EFAULT; return -EFAULT;
err = rtc_set_alarm(class_dev, &alarm); err = rtc_set_alarm(rtc, &alarm);
break; break;
case RTC_WKALM_RD: case RTC_WKALM_RD:
err = rtc_read_alarm(class_dev, &alarm); err = rtc_read_alarm(rtc, &alarm);
if (err < 0) if (err < 0)
return err; return err;

2
drivers/rtc/rtc-ds1553.c
View file

@ -203,7 +203,7 @@ static irqreturn_t ds1553_rtc_interrupt(int irq, void *dev_id)
events |= RTC_UF; events |= RTC_UF;
else else
events |= RTC_AF; events |= RTC_AF;
rtc_update_irq(&pdata->rtc->class_dev, 1, events); rtc_update_irq(pdata->rtc, 1, events);
return IRQ_HANDLED; return IRQ_HANDLED;
} }

4
drivers/rtc/rtc-omap.c
View file

@ -124,7 +124,7 @@ static void rtc_wait_not_busy(void)
/* now we have ~15 usec to read/write various registers */ /* now we have ~15 usec to read/write various registers */
} }
static irqreturn_t rtc_irq(int irq, void *class_dev) static irqreturn_t rtc_irq(int irq, void *rtc)
{ {
unsigned long events = 0; unsigned long events = 0;
u8 irq_data; u8 irq_data;
@ -141,7 +141,7 @@ static irqreturn_t rtc_irq(int irq, void *class_dev)
if (irq_data & OMAP_RTC_STATUS_1S_EVENT) if (irq_data & OMAP_RTC_STATUS_1S_EVENT)
events |= RTC_IRQF | RTC_UF; events |= RTC_IRQF | RTC_UF;
rtc_update_irq(class_dev, 1, events); rtc_update_irq(rtc, 1, events);
return IRQ_HANDLED; return IRQ_HANDLED;
} }

2
drivers/rtc/rtc-pl031.c
View file

@ -51,7 +51,7 @@ static irqreturn_t pl031_interrupt(int irq, void *dev_id)
{ {
struct rtc_device *rtc = dev_id; struct rtc_device *rtc = dev_id;
rtc_update_irq(&rtc->class_dev, 1, RTC_AF); rtc_update_irq(rtc, 1, RTC_AF);
return IRQ_HANDLED; return IRQ_HANDLED;
} }

19
drivers/rtc/rtc-proc.c
View file

@ -16,18 +16,21 @@
#include <linux/proc_fs.h> #include <linux/proc_fs.h>
#include <linux/seq_file.h> #include <linux/seq_file.h>
#include "rtc-core.h"
static struct class_device *rtc_dev = NULL; static struct class_device *rtc_dev = NULL;
static DEFINE_MUTEX(rtc_lock); static DEFINE_MUTEX(rtc_lock);
static int rtc_proc_show(struct seq_file *seq, void *offset) static int rtc_proc_show(struct seq_file *seq, void *offset)
{ {
int err; int err;
struct class_device *class_dev = seq->private; struct rtc_device *rtc = seq->private;
const struct rtc_class_ops *ops = to_rtc_device(class_dev)->ops; const struct rtc_class_ops *ops = rtc->ops;
struct rtc_wkalrm alrm; struct rtc_wkalrm alrm;
struct rtc_time tm; struct rtc_time tm;
err = rtc_read_time(class_dev, &tm); err = rtc_read_time(rtc, &tm);
if (err == 0) { if (err == 0) {
seq_printf(seq, seq_printf(seq,
"rtc_time\t: %02d:%02d:%02d\n" "rtc_time\t: %02d:%02d:%02d\n"
@ -36,7 +39,7 @@ static int rtc_proc_show(struct seq_file *seq, void *offset)
tm.tm_year + 1900, tm.tm_mon + 1, tm.tm_mday); tm.tm_year + 1900, tm.tm_mon + 1, tm.tm_mday);
} }
err = rtc_read_alarm(class_dev, &alrm); err = rtc_read_alarm(rtc, &alrm);
if (err == 0) { if (err == 0) {
seq_printf(seq, "alrm_time\t: "); seq_printf(seq, "alrm_time\t: ");
if ((unsigned int)alrm.time.tm_hour <= 24) if ((unsigned int)alrm.time.tm_hour <= 24)
@ -74,19 +77,19 @@ static int rtc_proc_show(struct seq_file *seq, void *offset)
seq_printf(seq, "24hr\t\t: yes\n"); seq_printf(seq, "24hr\t\t: yes\n");
if (ops->proc) if (ops->proc)
ops->proc(class_dev->dev, seq); ops->proc(rtc->class_dev.dev, seq);
return 0; return 0;
} }
static int rtc_proc_open(struct inode *inode, struct file *file) static int rtc_proc_open(struct inode *inode, struct file *file)
{ {
struct class_device *class_dev = PDE(inode)->data; struct rtc_device *rtc = PDE(inode)->data;
if (!try_module_get(THIS_MODULE)) if (!try_module_get(THIS_MODULE))
return -ENODEV; return -ENODEV;
return single_open(file, rtc_proc_show, class_dev); return single_open(file, rtc_proc_show, rtc);
} }
static int rtc_proc_release(struct inode *inode, struct file *file) static int rtc_proc_release(struct inode *inode, struct file *file)
@ -118,7 +121,7 @@ static int rtc_proc_add_device(struct class_device *class_dev,
ent->proc_fops = &rtc_proc_fops; ent->proc_fops = &rtc_proc_fops;
ent->owner = rtc->owner; ent->owner = rtc->owner;
ent->data = class_dev; ent->data = rtc;
dev_dbg(class_dev->dev, "rtc intf: proc\n"); dev_dbg(class_dev->dev, "rtc intf: proc\n");
} }

4
drivers/rtc/rtc-s3c.c
View file

@ -50,7 +50,7 @@ static irqreturn_t s3c_rtc_alarmirq(int irq, void *id)
{ {
struct rtc_device *rdev = id; struct rtc_device *rdev = id;
rtc_update_irq(&rdev->class_dev, 1, RTC_AF | RTC_IRQF); rtc_update_irq(rdev, 1, RTC_AF | RTC_IRQF);
return IRQ_HANDLED; return IRQ_HANDLED;
} }
@ -58,7 +58,7 @@ static irqreturn_t s3c_rtc_tickirq(int irq, void *id)
{ {
struct rtc_device *rdev = id; struct rtc_device *rdev = id;
rtc_update_irq(&rdev->class_dev, tick_count++, RTC_PF | RTC_IRQF); rtc_update_irq(rdev, tick_count++, RTC_PF | RTC_IRQF);
return IRQ_HANDLED; return IRQ_HANDLED;
} }

4
drivers/rtc/rtc-sa1100.c
View file

@ -93,7 +93,7 @@ static irqreturn_t sa1100_rtc_interrupt(int irq, void *dev_id)
if (rtsr & RTSR_HZ) if (rtsr & RTSR_HZ)
events |= RTC_UF | RTC_IRQF; events |= RTC_UF | RTC_IRQF;
rtc_update_irq(&rtc->class_dev, 1, events); rtc_update_irq(rtc, 1, events);
if (rtsr & RTSR_AL && rtc_periodic_alarm(&rtc_alarm)) if (rtsr & RTSR_AL && rtc_periodic_alarm(&rtc_alarm))
rtc_update_alarm(&rtc_alarm); rtc_update_alarm(&rtc_alarm);
@ -119,7 +119,7 @@ static irqreturn_t timer1_interrupt(int irq, void *dev_id)
*/ */
OSSR = OSSR_M1; /* clear match on timer1 */ OSSR = OSSR_M1; /* clear match on timer1 */
rtc_update_irq(&rtc->class_dev, rtc_timer1_count, RTC_PF | RTC_IRQF); rtc_update_irq(rtc, rtc_timer1_count, RTC_PF | RTC_IRQF);
if (rtc_timer1_count == 1) if (rtc_timer1_count == 1)
rtc_timer1_count = (rtc_freq * ((1<<30)/(TIMER_FREQ>>2))); rtc_timer1_count = (rtc_freq * ((1<<30)/(TIMER_FREQ>>2)));

6
drivers/rtc/rtc-sh.c
View file

@ -104,7 +104,7 @@ static irqreturn_t sh_rtc_interrupt(int irq, void *dev_id)
writeb(tmp, rtc->regbase + RCR1); writeb(tmp, rtc->regbase + RCR1);
rtc_update_irq(&rtc->rtc_dev->class_dev, 1, events); rtc_update_irq(&rtc->rtc_dev, 1, events);
spin_unlock(&rtc->lock); spin_unlock(&rtc->lock);
@ -139,7 +139,7 @@ static irqreturn_t sh_rtc_alarm(int irq, void *dev_id)
rtc->rearm_aie = 1; rtc->rearm_aie = 1;
rtc_update_irq(&rtc->rtc_dev->class_dev, 1, events); rtc_update_irq(&rtc->rtc_dev, 1, events);
} }
spin_unlock(&rtc->lock); spin_unlock(&rtc->lock);
@ -153,7 +153,7 @@ static irqreturn_t sh_rtc_periodic(int irq, void *dev_id)
spin_lock(&rtc->lock); spin_lock(&rtc->lock);
rtc_update_irq(&rtc->rtc_dev->class_dev, 1, RTC_PF | RTC_IRQF); rtc_update_irq(&rtc->rtc_dev, 1, RTC_PF | RTC_IRQF);
spin_unlock(&rtc->lock); spin_unlock(&rtc->lock);

18
drivers/rtc/rtc-sysfs.c
View file

@ -12,6 +12,9 @@
#include <linux/module.h> #include <linux/module.h>
#include <linux/rtc.h> #include <linux/rtc.h>
#include "rtc-core.h"
/* device attributes */ /* device attributes */
static ssize_t rtc_sysfs_show_name(struct class_device *dev, char *buf) static ssize_t rtc_sysfs_show_name(struct class_device *dev, char *buf)
@ -25,7 +28,7 @@ static ssize_t rtc_sysfs_show_date(struct class_device *dev, char *buf)
ssize_t retval; ssize_t retval;
struct rtc_time tm; struct rtc_time tm;
retval = rtc_read_time(dev, &tm); retval = rtc_read_time(to_rtc_device(dev), &tm);
if (retval == 0) { if (retval == 0) {
retval = sprintf(buf, "%04d-%02d-%02d\n", retval = sprintf(buf, "%04d-%02d-%02d\n",
tm.tm_year + 1900, tm.tm_mon + 1, tm.tm_mday); tm.tm_year + 1900, tm.tm_mon + 1, tm.tm_mday);
@ -40,7 +43,7 @@ static ssize_t rtc_sysfs_show_time(struct class_device *dev, char *buf)
ssize_t retval; ssize_t retval;
struct rtc_time tm; struct rtc_time tm;
retval = rtc_read_time(dev, &tm); retval = rtc_read_time(to_rtc_device(dev), &tm);
if (retval == 0) { if (retval == 0) {
retval = sprintf(buf, "%02d:%02d:%02d\n", retval = sprintf(buf, "%02d:%02d:%02d\n",
tm.tm_hour, tm.tm_min, tm.tm_sec); tm.tm_hour, tm.tm_min, tm.tm_sec);
@ -55,7 +58,7 @@ static ssize_t rtc_sysfs_show_since_epoch(struct class_device *dev, char *buf)
ssize_t retval; ssize_t retval;
struct rtc_time tm; struct rtc_time tm;
retval = rtc_read_time(dev, &tm); retval = rtc_read_time(to_rtc_device(dev), &tm);
if (retval == 0) { if (retval == 0) {
unsigned long time; unsigned long time;
rtc_tm_to_time(&tm, &time); rtc_tm_to_time(&tm, &time);
@ -94,7 +97,7 @@ rtc_sysfs_show_wakealarm(struct class_device *dev, char *buf)
* REVISIT maybe we should require RTC implementations to * REVISIT maybe we should require RTC implementations to
* disable the RTC alarm after it triggers, for uniformity. * disable the RTC alarm after it triggers, for uniformity.
*/ */
retval = rtc_read_alarm(dev, &alm); retval = rtc_read_alarm(to_rtc_device(dev), &alm);
if (retval == 0 && alm.enabled) { if (retval == 0 && alm.enabled) {
rtc_tm_to_time(&alm.time, &alarm); rtc_tm_to_time(&alm.time, &alarm);
retval = sprintf(buf, "%lu\n", alarm); retval = sprintf(buf, "%lu\n", alarm);
@ -109,11 +112,12 @@ rtc_sysfs_set_wakealarm(struct class_device *dev, const char *buf, size_t n)
ssize_t retval; ssize_t retval;
unsigned long now, alarm; unsigned long now, alarm;
struct rtc_wkalrm alm; struct rtc_wkalrm alm;
struct rtc_device *rtc = to_rtc_device(dev);
/* Only request alarms that trigger in the future. Disable them /* Only request alarms that trigger in the future. Disable them
* by writing another time, e.g. 0 meaning Jan 1 1970 UTC. * by writing another time, e.g. 0 meaning Jan 1 1970 UTC.
*/ */
retval = rtc_read_time(dev, &alm.time); retval = rtc_read_time(rtc, &alm.time);
if (retval < 0) if (retval < 0)
return retval; return retval;
rtc_tm_to_time(&alm.time, &now); rtc_tm_to_time(&alm.time, &now);
@ -124,7 +128,7 @@ rtc_sysfs_set_wakealarm(struct class_device *dev, const char *buf, size_t n)
* entirely prevent that here, without even the minimal * entirely prevent that here, without even the minimal
* locking from the /dev/rtcN api. * locking from the /dev/rtcN api.
*/ */
retval = rtc_read_alarm(dev, &alm); retval = rtc_read_alarm(rtc, &alm);
if (retval < 0) if (retval < 0)
return retval; return retval;
if (alm.enabled) if (alm.enabled)
@ -141,7 +145,7 @@ rtc_sysfs_set_wakealarm(struct class_device *dev, const char *buf, size_t n)
} }
rtc_time_to_tm(alarm, &alm.time); rtc_time_to_tm(alarm, &alm.time);
retval = rtc_set_alarm(dev, &alm); retval = rtc_set_alarm(rtc, &alm);
return (retval < 0) ? retval : n; return (retval < 0) ? retval : n;
} }
static const CLASS_DEVICE_ATTR(wakealarm, S_IRUGO | S_IWUSR, static const CLASS_DEVICE_ATTR(wakealarm, S_IRUGO | S_IWUSR,

6
drivers/rtc/rtc-test.c
View file

@ -101,11 +101,11 @@ static ssize_t test_irq_store(struct device *dev,
retval = count; retval = count;
local_irq_disable(); local_irq_disable();
if (strncmp(buf, "tick", 4) == 0) if (strncmp(buf, "tick", 4) == 0)
rtc_update_irq(&rtc->class_dev, 1, RTC_PF | RTC_IRQF); rtc_update_irq(rtc, 1, RTC_PF | RTC_IRQF);
else if (strncmp(buf, "alarm", 5) == 0) else if (strncmp(buf, "alarm", 5) == 0)
rtc_update_irq(&rtc->class_dev, 1, RTC_AF | RTC_IRQF); rtc_update_irq(rtc, 1, RTC_AF | RTC_IRQF);
else if (strncmp(buf, "update", 6) == 0) else if (strncmp(buf, "update", 6) == 0)
rtc_update_irq(&rtc->class_dev, 1, RTC_UF | RTC_IRQF); rtc_update_irq(rtc, 1, RTC_UF | RTC_IRQF);
else else
retval = -EINVAL; retval = -EINVAL;
local_irq_enable(); local_irq_enable();

4
drivers/rtc/rtc-vr41xx.c
View file

@ -275,7 +275,7 @@ static irqreturn_t elapsedtime_interrupt(int irq, void *dev_id)
rtc2_write(RTCINTREG, ELAPSEDTIME_INT); rtc2_write(RTCINTREG, ELAPSEDTIME_INT);
rtc_update_irq(&rtc->class_dev, 1, RTC_AF); rtc_update_irq(rtc, 1, RTC_AF);
return IRQ_HANDLED; return IRQ_HANDLED;
} }
@ -291,7 +291,7 @@ static irqreturn_t rtclong1_interrupt(int irq, void *dev_id)
rtc1_write(RTCL1LREG, count); rtc1_write(RTCL1LREG, count);
rtc1_write(RTCL1HREG, count >> 16); rtc1_write(RTCL1HREG, count >> 16);
rtc_update_irq(&rtc->class_dev, 1, RTC_PF); rtc_update_irq(rtc, 1, RTC_PF);
return IRQ_HANDLED; return IRQ_HANDLED;
} }

33
include/linux/rtc.h
View file

@ -4,7 +4,7 @@
* service. It is used with both the legacy mc146818 and also EFI * service. It is used with both the legacy mc146818 and also EFI
* Struct rtc_time and first 12 ioctl by Paul Gortmaker, 1996 - separated out * Struct rtc_time and first 12 ioctl by Paul Gortmaker, 1996 - separated out
* from <linux/mc146818rtc.h> to this file for 2.4 kernels. * from <linux/mc146818rtc.h> to this file for 2.4 kernels.
* *
* Copyright (C) 1999 Hewlett-Packard Co. * Copyright (C) 1999 Hewlett-Packard Co.
* Copyright (C) 1999 Stephane Eranian <eranian@hpl.hp.com> * Copyright (C) 1999 Stephane Eranian <eranian@hpl.hp.com>
*/ */
@ -13,7 +13,7 @@
/* /*
* The struct used to pass data via the following ioctl. Similar to the * The struct used to pass data via the following ioctl. Similar to the
* struct tm in <time.h>, but it needs to be here so that the kernel * struct tm in <time.h>, but it needs to be here so that the kernel
* source is self contained, allowing cross-compiles, etc. etc. * source is self contained, allowing cross-compiles, etc. etc.
*/ */
@ -50,7 +50,7 @@ struct rtc_wkalrm {
* pll_value*pll_posmult/pll_clock * pll_value*pll_posmult/pll_clock
* -ve pll_value means clock will run slower by * -ve pll_value means clock will run slower by
* pll_value*pll_negmult/pll_clock * pll_value*pll_negmult/pll_clock
*/ */
struct rtc_pll_info { struct rtc_pll_info {
int pll_ctrl; /* placeholder for fancier control */ int pll_ctrl; /* placeholder for fancier control */
@ -174,29 +174,28 @@ extern struct rtc_device *rtc_device_register(const char *name,
struct device *dev, struct device *dev,
const struct rtc_class_ops *ops, const struct rtc_class_ops *ops,
struct module *owner); struct module *owner);
extern void rtc_device_unregister(struct rtc_device *rdev); extern void rtc_device_unregister(struct rtc_device *rtc);
extern int rtc_interface_register(struct class_interface *intf);
extern int rtc_read_time(struct class_device *class_dev, struct rtc_time *tm); extern int rtc_read_time(struct rtc_device *rtc, struct rtc_time *tm);
extern int rtc_set_time(struct class_device *class_dev, struct rtc_time *tm); extern int rtc_set_time(struct rtc_device *rtc, struct rtc_time *tm);
extern int rtc_set_mmss(struct class_device *class_dev, unsigned long secs); extern int rtc_set_mmss(struct rtc_device *rtc, unsigned long secs);
extern int rtc_read_alarm(struct class_device *class_dev, extern int rtc_read_alarm(struct rtc_device *rtc,
struct rtc_wkalrm *alrm); struct rtc_wkalrm *alrm);
extern int rtc_set_alarm(struct class_device *class_dev, extern int rtc_set_alarm(struct rtc_device *rtc,
struct rtc_wkalrm *alrm); struct rtc_wkalrm *alrm);
extern void rtc_update_irq(struct class_device *class_dev, extern void rtc_update_irq(struct rtc_device *rtc,
unsigned long num, unsigned long events); unsigned long num, unsigned long events);
extern struct class_device *rtc_class_open(char *name); extern struct rtc_device *rtc_class_open(char *name);
extern void rtc_class_close(struct class_device *class_dev); extern void rtc_class_close(struct rtc_device *rtc);
extern int rtc_irq_register(struct class_device *class_dev, extern int rtc_irq_register(struct rtc_device *rtc,
struct rtc_task *task); struct rtc_task *task);
extern void rtc_irq_unregister(struct class_device *class_dev, extern void rtc_irq_unregister(struct rtc_device *rtc,
struct rtc_task *task); struct rtc_task *task);
extern int rtc_irq_set_state(struct class_device *class_dev, extern int rtc_irq_set_state(struct rtc_device *rtc,
struct rtc_task *task, int enabled); struct rtc_task *task, int enabled);
extern int rtc_irq_set_freq(struct class_device *class_dev, extern int rtc_irq_set_freq(struct rtc_device *rtc,
struct rtc_task *task, int freq); struct rtc_task *task, int freq);
typedef struct rtc_task { typedef struct rtc_task {