Date:2010-06-06 02:00:45 (13 years 6 months ago)
Author:Lars C.
Commit:9e07a13bcf0aa9e9a32f4395b7f48fb65fa68de4
Message:RTC: JZ4740: Use dev_get_drvdata directly instead of wrapping it in dev_to_rtc
Files: drivers/rtc/rtc-jz4740.c (6 diffs)

Change Details

drivers/rtc/rtc-jz4740.c
8787    spin_unlock_irqrestore(&rtc->lock, flags);
8888}
8989
90static inline struct jz4740_rtc *dev_to_rtc(struct device *dev)
91{
92    return dev_get_drvdata(dev);
93}
94
9590static int jz4740_rtc_read_time(struct device *dev, struct rtc_time *time)
9691{
97    struct jz4740_rtc *rtc = dev_to_rtc(dev);
92    struct jz4740_rtc *rtc = dev_get_drvdata(dev);
9893    uint32_t secs, secs2;
9994
10095    secs = jz4740_rtc_reg_read(rtc, JZ_REG_RTC_SEC);
...... 
112107
113108static int jz4740_rtc_set_mmss(struct device *dev, unsigned long secs)
114109{
115    struct jz4740_rtc *rtc = dev_to_rtc(dev);
110    struct jz4740_rtc *rtc = dev_get_drvdata(dev);
116111
117112    if ((uint32_t)secs != secs)
118113        return -EINVAL;
...... 
124119
125120static int jz4740_rtc_read_alarm(struct device *dev, struct rtc_wkalrm *alrm)
126121{
127    struct jz4740_rtc *rtc = dev_to_rtc(dev);
122    struct jz4740_rtc *rtc = dev_get_drvdata(dev);
128123    uint32_t secs, secs2;
129124    uint32_t ctrl;
130125
...... 
148143
149144static int jz4740_rtc_set_alarm(struct device *dev, struct rtc_wkalrm *alrm)
150145{
151    struct jz4740_rtc *rtc = dev_to_rtc(dev);
146    struct jz4740_rtc *rtc = dev_get_drvdata(dev);
152147    unsigned long secs;
153148
154149    rtc_tm_to_time(&alrm->time, &secs);
...... 
165160
166161static int jz4740_rtc_update_irq_enable(struct device *dev, unsigned int enable)
167162{
168    struct jz4740_rtc *rtc = dev_to_rtc(dev);
163    struct jz4740_rtc *rtc = dev_get_drvdata(dev);
169164    jz4740_rtc_ctrl_set_bits(rtc, JZ_RTC_CTRL_1HZ_IRQ,
170165                    enable ? JZ_RTC_CTRL_1HZ_IRQ : 0);
171166    return 0;
...... 
174169
175170static int jz4740_rtc_alarm_irq_enable(struct device *dev, unsigned int enable)
176171{
177    struct jz4740_rtc *rtc = dev_to_rtc(dev);
172    struct jz4740_rtc *rtc = dev_get_drvdata(dev);
178173    jz4740_rtc_ctrl_set_bits(rtc, JZ_RTC_CTRL_AF_IRQ,
179174                    enable ? JZ_RTC_CTRL_AF_IRQ : 0);
180175    return 0;

Archive Download the corresponding diff file

Branches:
ben-wpan
ben-wpan-stefan
5396a9238205f20f811ea57898980d3ca82df0b6
jz-2.6.34
jz-2.6.34-rc5
jz-2.6.34-rc6
jz-2.6.34-rc7
jz-2.6.35
jz-2.6.36
jz-2.6.37
jz-2.6.38
jz-2.6.39
jz-3.0
jz-3.1
jz-3.11
jz-3.12
jz-3.13
jz-3.15
jz-3.16
jz-3.18-dt
jz-3.2
jz-3.3
jz-3.4
jz-3.5
jz-3.6
jz-3.6-rc2-pwm
jz-3.9
jz-3.9-clk
jz-3.9-rc8
jz47xx
jz47xx-2.6.38
master

Tags:
od-2011-09-04
od-2011-09-18
v2.6.34-rc5
v2.6.34-rc6
v2.6.34-rc7
v3.9



interactive