Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/zohar/linux...

[cascardo/linux.git] / drivers / rtc / rtc-ep93xx.c

diff --git a/drivers/rtc/rtc-ep93xx.c b/drivers/rtc/rtc-ep93xx.c
index 580e7b5..de325d6 100644 (file)
--- a/drivers/rtc/rtc-ep93xx.c
+++ b/drivers/rtc/rtc-ep93xx.c
@@ -42,7 +42,7 @@ struct ep93xx_rtc {
 static int ep93xx_rtc_get_swcomp(struct device *dev, unsigned short *preload,
                                unsigned short *delete)
 {
-       struct ep93xx_rtc *ep93xx_rtc = dev->platform_data;
+       struct ep93xx_rtc *ep93xx_rtc = dev_get_platdata(dev);
        unsigned long comp;
 
        comp = __raw_readl(ep93xx_rtc->mmio_base + EP93XX_RTC_SWCOMP);
@@ -60,7 +60,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)
 {
-       struct ep93xx_rtc *ep93xx_rtc = dev->platform_data;
+       struct ep93xx_rtc *ep93xx_rtc = dev_get_platdata(dev);
        unsigned long time;
 
         time = __raw_readl(ep93xx_rtc->mmio_base + EP93XX_RTC_DATA);
@@ -71,7 +71,7 @@ static int ep93xx_rtc_read_time(struct device *dev, struct rtc_time *tm)
 
 static int ep93xx_rtc_set_mmss(struct device *dev, unsigned long secs)
 {
-       struct ep93xx_rtc *ep93xx_rtc = dev->platform_data;
+       struct ep93xx_rtc *ep93xx_rtc = dev_get_platdata(dev);
 
        __raw_writel(secs + 1, ep93xx_rtc->mmio_base + EP93XX_RTC_LOAD);
        return 0;
@@ -174,7 +174,6 @@ static int ep93xx_rtc_remove(struct platform_device *pdev)
 static struct platform_driver ep93xx_rtc_driver = {
        .driver         = {
                .name   = "ep93xx-rtc",
-               .owner  = THIS_MODULE,
        },
        .probe          = ep93xx_rtc_probe,
        .remove         = ep93xx_rtc_remove,