projects
/
linux-2.6-microblaze.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
s390: update defconfigs
[linux-2.6-microblaze.git]
/
drivers
/
rtc
/
rtc-ep93xx.c
diff --git
a/drivers/rtc/rtc-ep93xx.c
b/drivers/rtc/rtc-ep93xx.c
index
8ec9ea1
..
acae7f1
100644
(file)
--- a/
drivers/rtc/rtc-ep93xx.c
+++ b/
drivers/rtc/rtc-ep93xx.c
@@
-33,7
+33,7
@@
struct ep93xx_rtc {
static int ep93xx_rtc_get_swcomp(struct device *dev, unsigned short *preload,
unsigned short *delete)
{
static int ep93xx_rtc_get_swcomp(struct device *dev, unsigned short *preload,
unsigned short *delete)
{
- struct ep93xx_rtc *ep93xx_rtc = dev_get_
plat
data(dev);
+ struct ep93xx_rtc *ep93xx_rtc = dev_get_
drv
data(dev);
unsigned long comp;
comp = readl(ep93xx_rtc->mmio_base + EP93XX_RTC_SWCOMP);
unsigned long comp;
comp = readl(ep93xx_rtc->mmio_base + EP93XX_RTC_SWCOMP);
@@
-51,7
+51,7
@@
static int ep93xx_rtc_get_swcomp(struct device *dev, unsigned short *preload,
static int ep93xx_rtc_read_time(struct device *dev, struct rtc_time *tm)
{
static int ep93xx_rtc_read_time(struct device *dev, struct rtc_time *tm)
{
- struct ep93xx_rtc *ep93xx_rtc = dev_get_
plat
data(dev);
+ struct ep93xx_rtc *ep93xx_rtc = dev_get_
drv
data(dev);
unsigned long time;
time = readl(ep93xx_rtc->mmio_base + EP93XX_RTC_DATA);
unsigned long time;
time = readl(ep93xx_rtc->mmio_base + EP93XX_RTC_DATA);
@@
-62,7
+62,7
@@
static int ep93xx_rtc_read_time(struct device *dev, struct rtc_time *tm)
static int ep93xx_rtc_set_time(struct device *dev, struct rtc_time *tm)
{
static int ep93xx_rtc_set_time(struct device *dev, struct rtc_time *tm)
{
- struct ep93xx_rtc *ep93xx_rtc = dev_get_
plat
data(dev);
+ struct ep93xx_rtc *ep93xx_rtc = dev_get_
drv
data(dev);
unsigned long secs = rtc_tm_to_time64(tm);
writel(secs + 1, ep93xx_rtc->mmio_base + EP93XX_RTC_LOAD);
unsigned long secs = rtc_tm_to_time64(tm);
writel(secs + 1, ep93xx_rtc->mmio_base + EP93XX_RTC_LOAD);
@@
-145,7
+145,7
@@
static int ep93xx_rtc_probe(struct platform_device *pdev)
if (err)
return err;
if (err)
return err;
- return rtc_register_device(ep93xx_rtc->rtc);
+ return
devm_
rtc_register_device(ep93xx_rtc->rtc);
}
static struct platform_driver ep93xx_rtc_driver = {
}
static struct platform_driver ep93xx_rtc_driver = {