mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-25 10:19:47 +00:00
[PATCH] RTC driver init adjustment
- conditionalizes procfs code upon CONFIG_PROC_FS (to reduce code size when that option is not enabled) - make initialization no longer fail when the procfs entry can't be allocated (namely would initialization always have failed when CONFIG_PROC_FS was not set) - move the formerly file-scope static variable rtc_int_handler_ptr into the only function using it, and makes it automatic. Signed-off-by: Jan Beulich <jbeulich@novell.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
parent
f3e92d355e
commit
9cef779ec3
1 changed files with 17 additions and 15 deletions
|
@ -113,7 +113,7 @@ static int rtc_has_irq = 1;
|
|||
#define hpet_set_rtc_irq_bit(arg) 0
|
||||
#define hpet_rtc_timer_init() do { } while (0)
|
||||
#define hpet_rtc_dropped_irq() 0
|
||||
static inline irqreturn_t hpet_rtc_interrupt(int irq, void *dev_id) {return 0;}
|
||||
static irqreturn_t hpet_rtc_interrupt(int irq, void *dev_id) {return 0;}
|
||||
#else
|
||||
extern irqreturn_t hpet_rtc_interrupt(int irq, void *dev_id);
|
||||
#endif
|
||||
|
@ -165,7 +165,9 @@ static void mask_rtc_irq_bit(unsigned char bit)
|
|||
}
|
||||
#endif
|
||||
|
||||
#ifdef CONFIG_PROC_FS
|
||||
static int rtc_proc_open(struct inode *inode, struct file *file);
|
||||
#endif
|
||||
|
||||
/*
|
||||
* Bits in rtc_status. (6 bits of room for future expansion)
|
||||
|
@ -906,6 +908,7 @@ static struct miscdevice rtc_dev = {
|
|||
.fops = &rtc_fops,
|
||||
};
|
||||
|
||||
#ifdef CONFIG_PROC_FS
|
||||
static const struct file_operations rtc_proc_fops = {
|
||||
.owner = THIS_MODULE,
|
||||
.open = rtc_proc_open,
|
||||
|
@ -913,14 +916,13 @@ static const struct file_operations rtc_proc_fops = {
|
|||
.llseek = seq_lseek,
|
||||
.release = single_release,
|
||||
};
|
||||
|
||||
#if defined(RTC_IRQ) && !defined(__sparc__)
|
||||
static irq_handler_t rtc_int_handler_ptr;
|
||||
#endif
|
||||
|
||||
static int __init rtc_init(void)
|
||||
{
|
||||
#ifdef CONFIG_PROC_FS
|
||||
struct proc_dir_entry *ent;
|
||||
#endif
|
||||
#if defined(__alpha__) || defined(__mips__)
|
||||
unsigned int year, ctrl;
|
||||
char *guess = NULL;
|
||||
|
@ -932,9 +934,11 @@ static int __init rtc_init(void)
|
|||
struct sparc_isa_bridge *isa_br;
|
||||
struct sparc_isa_device *isa_dev;
|
||||
#endif
|
||||
#endif
|
||||
#ifndef __sparc__
|
||||
#else
|
||||
void *r;
|
||||
#ifdef RTC_IRQ
|
||||
irq_handler_t rtc_int_handler_ptr;
|
||||
#endif
|
||||
#endif
|
||||
|
||||
#ifdef __sparc__
|
||||
|
@ -1024,17 +1028,13 @@ static int __init rtc_init(void)
|
|||
return -ENODEV;
|
||||
}
|
||||
|
||||
#ifdef CONFIG_PROC_FS
|
||||
ent = create_proc_entry("driver/rtc", 0, NULL);
|
||||
if (!ent) {
|
||||
#ifdef RTC_IRQ
|
||||
free_irq(RTC_IRQ, NULL);
|
||||
rtc_has_irq = 0;
|
||||
if (ent)
|
||||
ent->proc_fops = &rtc_proc_fops;
|
||||
else
|
||||
printk(KERN_WARNING "rtc: Failed to register with procfs.\n");
|
||||
#endif
|
||||
release_region(RTC_PORT(0), RTC_IO_EXTENT);
|
||||
misc_deregister(&rtc_dev);
|
||||
return -ENOMEM;
|
||||
}
|
||||
ent->proc_fops = &rtc_proc_fops;
|
||||
|
||||
#if defined(__alpha__) || defined(__mips__)
|
||||
rtc_freq = HZ;
|
||||
|
@ -1167,6 +1167,7 @@ static void rtc_dropped_irq(unsigned long data)
|
|||
}
|
||||
#endif
|
||||
|
||||
#ifdef CONFIG_PROC_FS
|
||||
/*
|
||||
* Info exported via "/proc/driver/rtc".
|
||||
*/
|
||||
|
@ -1251,6 +1252,7 @@ static int rtc_proc_open(struct inode *inode, struct file *file)
|
|||
{
|
||||
return single_open(file, rtc_proc_show, NULL);
|
||||
}
|
||||
#endif
|
||||
|
||||
void rtc_get_rtc_time(struct rtc_time *rtc_tm)
|
||||
{
|
||||
|
|
Loading…
Reference in a new issue