Merge branch 'for-linus' of git://neil.brown.name/md

[safe/jmp/linux-2.6] / drivers / rtc / rtc-ds1742.c

diff --git a/drivers/rtc/rtc-ds1742.c b/drivers/rtc/rtc-ds1742.c
index 17633bf..8bc8501 100644 (file)
--- a/drivers/rtc/rtc-ds1742.c
+++ b/drivers/rtc/rtc-ds1742.c
@@ -55,7 +55,7 @@ struct rtc_plat_data {
        void __iomem *ioaddr_rtc;
        size_t size_nvram;
        size_t size;
-       unsigned long baseaddr;
+       resource_size_t baseaddr;
        unsigned long last_jiffies;
 };
 
@@ -66,17 +66,17 @@ static int ds1742_rtc_set_time(struct device *dev, struct rtc_time *tm)
        void __iomem *ioaddr = pdata->ioaddr_rtc;
        u8 century;
 
-       century = BIN2BCD((tm->tm_year + 1900) / 100);
+       century = bin2bcd((tm->tm_year + 1900) / 100);
 
        writeb(RTC_WRITE, ioaddr + RTC_CONTROL);
 
-       writeb(BIN2BCD(tm->tm_year % 100), ioaddr + RTC_YEAR);
-       writeb(BIN2BCD(tm->tm_mon + 1), ioaddr + RTC_MONTH);
-       writeb(BIN2BCD(tm->tm_wday) & RTC_DAY_MASK, ioaddr + RTC_DAY);
-       writeb(BIN2BCD(tm->tm_mday), ioaddr + RTC_DATE);
-       writeb(BIN2BCD(tm->tm_hour), ioaddr + RTC_HOURS);
-       writeb(BIN2BCD(tm->tm_min), ioaddr + RTC_MINUTES);
-       writeb(BIN2BCD(tm->tm_sec) & RTC_SECONDS_MASK, ioaddr + RTC_SECONDS);
+       writeb(bin2bcd(tm->tm_year % 100), ioaddr + RTC_YEAR);
+       writeb(bin2bcd(tm->tm_mon + 1), ioaddr + RTC_MONTH);
+       writeb(bin2bcd(tm->tm_wday) & RTC_DAY_MASK, ioaddr + RTC_DAY);
+       writeb(bin2bcd(tm->tm_mday), ioaddr + RTC_DATE);
+       writeb(bin2bcd(tm->tm_hour), ioaddr + RTC_HOURS);
+       writeb(bin2bcd(tm->tm_min), ioaddr + RTC_MINUTES);
+       writeb(bin2bcd(tm->tm_sec) & RTC_SECONDS_MASK, ioaddr + RTC_SECONDS);
 
        /* RTC_CENTURY and RTC_CONTROL share same register */
        writeb(RTC_WRITE | (century & RTC_CENTURY_MASK), ioaddr + RTC_CENTURY);
@@ -106,14 +106,14 @@ static int ds1742_rtc_read_time(struct device *dev, struct rtc_time *tm)
        year = readb(ioaddr + RTC_YEAR);
        century = readb(ioaddr + RTC_CENTURY) & RTC_CENTURY_MASK;
        writeb(0, ioaddr + RTC_CONTROL);
-       tm->tm_sec = BCD2BIN(second);
-       tm->tm_min = BCD2BIN(minute);
-       tm->tm_hour = BCD2BIN(hour);
-       tm->tm_mday = BCD2BIN(day);
-       tm->tm_wday = BCD2BIN(week);
-       tm->tm_mon = BCD2BIN(month) - 1;
+       tm->tm_sec = bcd2bin(second);
+       tm->tm_min = bcd2bin(minute);
+       tm->tm_hour = bcd2bin(hour);
+       tm->tm_mday = bcd2bin(day);
+       tm->tm_wday = bcd2bin(week);
+       tm->tm_mon = bcd2bin(month) - 1;
        /* year is 1900 + tm->tm_year */
-       tm->tm_year = BCD2BIN(year) + BCD2BIN(century) * 100 - 1900;
+       tm->tm_year = bcd2bin(year) + bcd2bin(century) * 100 - 1900;
 
        if (rtc_valid_tm(tm) < 0) {
                dev_err(dev, "retrieved date/time is not valid.\n");
@@ -127,8 +127,9 @@ static const struct rtc_class_ops ds1742_rtc_ops = {
        .set_time       = ds1742_rtc_set_time,
 };
 
-static ssize_t ds1742_nvram_read(struct kobject *kobj, char *buf,
-                                loff_t pos, size_t size)
+static ssize_t ds1742_nvram_read(struct kobject *kobj,
+                                struct bin_attribute *bin_attr,
+                                char *buf, loff_t pos, size_t size)
 {
        struct platform_device *pdev =
                to_platform_device(container_of(kobj, struct device, kobj));
@@ -141,8 +142,9 @@ static ssize_t ds1742_nvram_read(struct kobject *kobj, char *buf,
        return count;
 }
 
-static ssize_t ds1742_nvram_write(struct kobject *kobj, char *buf,
-                                 loff_t pos, size_t size)
+static ssize_t ds1742_nvram_write(struct kobject *kobj,
+                                 struct bin_attribute *bin_attr,
+                                 char *buf, loff_t pos, size_t size)
 {
        struct platform_device *pdev =
                to_platform_device(container_of(kobj, struct device, kobj));
@@ -158,14 +160,16 @@ static ssize_t ds1742_nvram_write(struct kobject *kobj, char *buf,
 static struct bin_attribute ds1742_nvram_attr = {
        .attr = {
                .name = "nvram",
-               .mode = S_IRUGO | S_IWUGO,
-               .owner = THIS_MODULE,
+               .mode = S_IRUGO | S_IWUSR,
        },
        .read = ds1742_nvram_read,
        .write = ds1742_nvram_write,
+       /* REVISIT: size in sysfs won't match actual size... if it's
+        * not a constant, each RTC should have its own attribute.
+        */
 };
 
-static int __init ds1742_rtc_probe(struct platform_device *pdev)
+static int __devinit ds1742_rtc_probe(struct platform_device *pdev)
 {
        struct rtc_device *rtc;
        struct resource *res;
@@ -250,7 +254,7 @@ static struct platform_driver ds1742_rtc_driver = {
        .probe          = ds1742_rtc_probe,
        .remove         = __devexit_p(ds1742_rtc_remove),
        .driver         = {
-               .name   = "ds1742",
+               .name   = "rtc-ds1742",
                .owner  = THIS_MODULE,
        },
 };
@@ -262,7 +266,7 @@ static __init int ds1742_init(void)
 
 static __exit void ds1742_exit(void)
 {
-       return platform_driver_unregister(&ds1742_rtc_driver);
+       platform_driver_unregister(&ds1742_rtc_driver);
 }
 
 module_init(ds1742_init);
@@ -272,3 +276,4 @@ MODULE_AUTHOR("Atsushi Nemoto <anemo@mba.ocn.ne.jp>");
 MODULE_DESCRIPTION("Dallas DS1742 RTC driver");
 MODULE_LICENSE("GPL");
 MODULE_VERSION(DRV_VERSION);
+MODULE_ALIAS("platform:rtc-ds1742");