lkml.org 
[lkml]   [2006]   [Mar]   [18]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[PATCH 02/18] RTC subsystem, ARM cleanup
    This patch removes from the ARM subsytem some of the
    rtc-related functions that have been included in
    the RTC subsystem. It also fixes some naming collisions.

    Signed-off-by: Alessandro Zummo <a.zummo@towertech.it>
    Signed-off-by: Andrew Morton <akpm@osdl.org>
    --

    arch/arm/Kconfig | 3 +
    arch/arm/common/rtctime.c | 108 +++++-----------------------------------------
    drivers/char/Kconfig | 2
    include/asm-arm/rtc.h | 3 -
    4 files changed, 17 insertions(+), 99 deletions(-)

    --- linux-rtc.orig/arch/arm/common/rtctime.c 2006-02-28 12:35:57.000000000 +0100
    +++ linux-rtc/arch/arm/common/rtctime.c 2006-02-28 12:37:14.000000000 +0100
    @@ -20,6 +20,7 @@
    #include <linux/capability.h>
    #include <linux/device.h>
    #include <linux/mutex.h>
    +#include <linux/rtc.h>

    #include <asm/rtc.h>
    #include <asm/semaphore.h>
    @@ -42,89 +43,6 @@ static struct rtc_ops *rtc_ops;

    #define rtc_epoch 1900UL

    -static const unsigned char days_in_month[] = {
    - 31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31
    -};
    -
    -#define LEAPS_THRU_END_OF(y) ((y)/4 - (y)/100 + (y)/400)
    -#define LEAP_YEAR(year) ((!(year % 4) && (year % 100)) || !(year % 400))
    -
    -static int month_days(unsigned int month, unsigned int year)
    -{
    - return days_in_month[month] + (LEAP_YEAR(year) && month == 1);
    -}
    -
    -/*
    - * Convert seconds since 01-01-1970 00:00:00 to Gregorian date.
    - */
    -void rtc_time_to_tm(unsigned long time, struct rtc_time *tm)
    -{
    - int days, month, year;
    -
    - days = time / 86400;
    - time -= days * 86400;
    -
    - tm->tm_wday = (days + 4) % 7;
    -
    - year = 1970 + days / 365;
    - days -= (year - 1970) * 365
    - + LEAPS_THRU_END_OF(year - 1)
    - - LEAPS_THRU_END_OF(1970 - 1);
    - if (days < 0) {
    - year -= 1;
    - days += 365 + LEAP_YEAR(year);
    - }
    - tm->tm_year = year - 1900;
    - tm->tm_yday = days + 1;
    -
    - for (month = 0; month < 11; month++) {
    - int newdays;
    -
    - newdays = days - month_days(month, year);
    - if (newdays < 0)
    - break;
    - days = newdays;
    - }
    - tm->tm_mon = month;
    - tm->tm_mday = days + 1;
    -
    - tm->tm_hour = time / 3600;
    - time -= tm->tm_hour * 3600;
    - tm->tm_min = time / 60;
    - tm->tm_sec = time - tm->tm_min * 60;
    -}
    -EXPORT_SYMBOL(rtc_time_to_tm);
    -
    -/*
    - * Does the rtc_time represent a valid date/time?
    - */
    -int rtc_valid_tm(struct rtc_time *tm)
    -{
    - if (tm->tm_year < 70 ||
    - tm->tm_mon >= 12 ||
    - tm->tm_mday < 1 ||
    - tm->tm_mday > month_days(tm->tm_mon, tm->tm_year + 1900) ||
    - tm->tm_hour >= 24 ||
    - tm->tm_min >= 60 ||
    - tm->tm_sec >= 60)
    - return -EINVAL;
    -
    - return 0;
    -}
    -EXPORT_SYMBOL(rtc_valid_tm);
    -
    -/*
    - * Convert Gregorian date to seconds since 01-01-1970 00:00:00.
    - */
    -int rtc_tm_to_time(struct rtc_time *tm, unsigned long *time)
    -{
    - *time = mktime(tm->tm_year + 1900, tm->tm_mon + 1, tm->tm_mday,
    - tm->tm_hour, tm->tm_min, tm->tm_sec);
    -
    - return 0;
    -}
    -EXPORT_SYMBOL(rtc_tm_to_time);
    -
    /*
    * Calculate the next alarm time given the requested alarm time mask
    * and the current time.
    @@ -151,13 +69,13 @@ void rtc_next_alarm_time(struct rtc_time
    }
    }

    -static inline int rtc_read_time(struct rtc_ops *ops, struct rtc_time *tm)
    +static inline int rtc_arm_read_time(struct rtc_ops *ops, struct rtc_time *tm)
    {
    memset(tm, 0, sizeof(struct rtc_time));
    return ops->read_time(tm);
    }

    -static inline int rtc_set_time(struct rtc_ops *ops, struct rtc_time *tm)
    +static inline int rtc_arm_set_time(struct rtc_ops *ops, struct rtc_time *tm)
    {
    int ret;

    @@ -168,7 +86,7 @@ static inline int rtc_set_time(struct rt
    return ret;
    }

    -static inline int rtc_read_alarm(struct rtc_ops *ops, struct rtc_wkalrm *alrm)
    +static inline int rtc_arm_read_alarm(struct rtc_ops *ops, struct rtc_wkalrm *alrm)
    {
    int ret = -EINVAL;
    if (ops->read_alarm) {
    @@ -178,7 +96,7 @@ static inline int rtc_read_alarm(struct
    return ret;
    }

    -static inline int rtc_set_alarm(struct rtc_ops *ops, struct rtc_wkalrm *alrm)
    +static inline int rtc_arm_set_alarm(struct rtc_ops *ops, struct rtc_wkalrm *alrm)
    {
    int ret = -EINVAL;
    if (ops->set_alarm)
    @@ -266,7 +184,7 @@ static int rtc_ioctl(struct inode *inode

    switch (cmd) {
    case RTC_ALM_READ:
    - ret = rtc_read_alarm(ops, &alrm);
    + ret = rtc_arm_read_alarm(ops, &alrm);
    if (ret)
    break;
    ret = copy_to_user(uarg, &alrm.time, sizeof(tm));
    @@ -288,11 +206,11 @@ static int rtc_ioctl(struct inode *inode
    alrm.time.tm_wday = -1;
    alrm.time.tm_yday = -1;
    alrm.time.tm_isdst = -1;
    - ret = rtc_set_alarm(ops, &alrm);
    + ret = rtc_arm_set_alarm(ops, &alrm);
    break;

    case RTC_RD_TIME:
    - ret = rtc_read_time(ops, &tm);
    + ret = rtc_arm_read_time(ops, &tm);
    if (ret)
    break;
    ret = copy_to_user(uarg, &tm, sizeof(tm));
    @@ -310,7 +228,7 @@ static int rtc_ioctl(struct inode *inode
    ret = -EFAULT;
    break;
    }
    - ret = rtc_set_time(ops, &tm);
    + ret = rtc_arm_set_time(ops, &tm);
    break;

    case RTC_EPOCH_SET:
    @@ -341,11 +259,11 @@ static int rtc_ioctl(struct inode *inode
    ret = -EFAULT;
    break;
    }
    - ret = rtc_set_alarm(ops, &alrm);
    + ret = rtc_arm_set_alarm(ops, &alrm);
    break;

    case RTC_WKALM_RD:
    - ret = rtc_read_alarm(ops, &alrm);
    + ret = rtc_arm_read_alarm(ops, &alrm);
    if (ret)
    break;
    ret = copy_to_user(uarg, &alrm, sizeof(alrm));
    @@ -435,7 +353,7 @@ static int rtc_read_proc(char *page, cha
    struct rtc_time tm;
    char *p = page;

    - if (rtc_read_time(ops, &tm) == 0) {
    + if (rtc_arm_read_time(ops, &tm) == 0) {
    p += sprintf(p,
    "rtc_time\t: %02d:%02d:%02d\n"
    "rtc_date\t: %04d-%02d-%02d\n"
    @@ -445,7 +363,7 @@ static int rtc_read_proc(char *page, cha
    rtc_epoch);
    }

    - if (rtc_read_alarm(ops, &alrm) == 0) {
    + if (rtc_arm_read_alarm(ops, &alrm) == 0) {
    p += sprintf(p, "alrm_time\t: ");
    if ((unsigned int)alrm.time.tm_hour <= 24)
    p += sprintf(p, "%02d:", alrm.time.tm_hour);
    --- linux-rtc.orig/include/asm-arm/rtc.h 2006-02-28 12:35:57.000000000 +0100
    +++ linux-rtc/include/asm-arm/rtc.h 2006-02-28 12:37:14.000000000 +0100
    @@ -25,9 +25,6 @@ struct rtc_ops {
    int (*proc)(char *buf);
    };

    -void rtc_time_to_tm(unsigned long, struct rtc_time *);
    -int rtc_tm_to_time(struct rtc_time *, unsigned long *);
    -int rtc_valid_tm(struct rtc_time *);
    void rtc_next_alarm_time(struct rtc_time *, struct rtc_time *, struct rtc_time *);
    void rtc_update(unsigned long, unsigned long);
    int register_rtc(struct rtc_ops *);
    --- linux-rtc.orig/drivers/char/Kconfig 2006-02-28 12:35:57.000000000 +0100
    +++ linux-rtc/drivers/char/Kconfig 2006-02-28 12:37:14.000000000 +0100
    @@ -695,7 +695,7 @@ config NVRAM

    config RTC
    tristate "Enhanced Real Time Clock Support"
    - depends on !PPC32 && !PARISC && !IA64 && !M68K && (!SPARC || PCI) && !FRV
    + depends on !PPC32 && !PARISC && !IA64 && !M68K && (!SPARC || PCI) && !FRV && !ARM
    ---help---
    If you say Y here and create a character special file /dev/rtc with
    major number 10 and minor number 135 using mknod ("man mknod"), you
    --- linux-rtc.orig/arch/arm/Kconfig 2006-02-28 12:35:57.000000000 +0100
    +++ linux-rtc/arch/arm/Kconfig 2006-02-28 12:40:04.000000000 +0100
    @@ -8,6 +8,7 @@ mainmenu "Linux Kernel Configuration"
    config ARM
    bool
    default y
    + select RTC_LIB
    help
    The ARM series is a line of low-power-consumption RISC chip designs
    licensed by ARM Ltd and targeted at embedded applications and
    @@ -817,6 +818,8 @@ source "drivers/usb/Kconfig"

    source "drivers/mmc/Kconfig"

    +source "drivers/rtc/Kconfig"
    +
    endmenu

    source "fs/Kconfig"
    --
    -
    To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
    the body of a message to majordomo@vger.kernel.org
    More majordomo info at http://vger.kernel.org/majordomo-info.html
    Please read the FAQ at http://www.tux.org/lkml/

    \
     
     \ /
      Last update: 2006-03-18 18:24    [W:0.033 / U:0.476 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site