lkml.org 
[lkml]   [2006]   [Mar]   [5]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[PATCH 03/16] RTC subsystem, ARM Integrator cleanup
    Fix some namespace conflicts between the RTC subsystem and the ARM
    Integrator time functions.

    Signed-off-by: Richard Purdie <rpurdie@rpsys.net>
    Signed-off-by: Alessandro Zummo <a.zummo@towertech.it>

    ---
    arch/arm/mach-integrator/time.c | 16 ++++++++--------
    1 file changed, 8 insertions(+), 8 deletions(-)

    --- linux-rtc.orig/arch/arm/mach-integrator/time.c 2006-03-03 00:15:21.000000000 +0100
    +++ linux-rtc/arch/arm/mach-integrator/time.c 2006-03-05 01:22:45.000000000 +0100
    @@ -40,13 +40,13 @@ static int integrator_set_rtc(void)
    return 1;
    }

    -static int rtc_read_alarm(struct rtc_wkalrm *alrm)
    +static int integrator_rtc_read_alarm(struct rtc_wkalrm *alrm)
    {
    rtc_time_to_tm(readl(rtc_base + RTC_MR), &alrm->time);
    return 0;
    }

    -static inline int rtc_set_alarm(struct rtc_wkalrm *alrm)
    +static inline int integrator_rtc_set_alarm(struct rtc_wkalrm *alrm)
    {
    unsigned long time;
    int ret;
    @@ -62,7 +62,7 @@ static inline int rtc_set_alarm(struct r
    return ret;
    }

    -static int rtc_read_time(struct rtc_time *tm)
    +static int integrator_rtc_read_time(struct rtc_time *tm)
    {
    rtc_time_to_tm(readl(rtc_base + RTC_DR), tm);
    return 0;
    @@ -76,7 +76,7 @@ static int rtc_read_time(struct rtc_time
    * edge of the 1Hz clock, we must write the time one second
    * in advance.
    */
    -static inline int rtc_set_time(struct rtc_time *tm)
    +static inline int integrator_rtc_set_time(struct rtc_time *tm)
    {
    unsigned long time;
    int ret;
    @@ -90,10 +90,10 @@ static inline int rtc_set_time(struct rt

    static struct rtc_ops rtc_ops = {
    .owner = THIS_MODULE,
    - .read_time = rtc_read_time,
    - .set_time = rtc_set_time,
    - .read_alarm = rtc_read_alarm,
    - .set_alarm = rtc_set_alarm,
    + .read_time = integrator_rtc_read_time,
    + .set_time = integrator_rtc_set_time,
    + .read_alarm = integrator_rtc_read_alarm,
    + .set_alarm = integrator_rtc_set_alarm,
    };

    static irqreturn_t arm_rtc_interrupt(int irq, void *dev_id,
    --
    -
    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-06 13:11    [W:4.898 / U:0.012 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site