p54usb: Add device ID for Dell WLA3310 USB

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

diff --git a/drivers/rtc/rtc-ds1302.c b/drivers/rtc/rtc-ds1302.c
index c64e2d7..532acf9 100644 (file)
--- a/drivers/rtc/rtc-ds1302.c
+++ b/drivers/rtc/rtc-ds1302.c
@@ -97,8 +97,6 @@ static void ds1302_writebyte(unsigned int addr, unsigned int val)
 
 static int ds1302_rtc_read_time(struct device *dev, struct rtc_time *tm)
 {
-       struct ds1302_rtc *rtc = dev_get_drvdata(dev);
-
        tm->tm_sec      = bcd2bin(ds1302_readbyte(RTC_ADDR_SEC));
        tm->tm_min      = bcd2bin(ds1302_readbyte(RTC_ADDR_MIN));
        tm->tm_hour     = bcd2bin(ds1302_readbyte(RTC_ADDR_HOUR));
@@ -145,7 +143,6 @@ static int ds1302_rtc_ioctl(struct device *dev, unsigned int cmd,
 #ifdef RTC_SET_CHARGE
        case RTC_SET_CHARGE:
        {
-               struct ds1302_rtc *rtc = dev_get_drvdata(dev);
                int tcs_val;
 
                if (copy_from_user(&tcs_val, (int __user *)arg, sizeof(int)))
@@ -169,7 +166,6 @@ static struct rtc_class_ops ds1302_rtc_ops = {
 static int __init ds1302_rtc_probe(struct platform_device *pdev)
 {
        struct rtc_device *rtc;
-       int ret;
 
        /* Reset */
        set_dp(get_dp() & ~(RTC_RESET | RTC_IODATA | RTC_SCLK));
@@ -204,7 +200,7 @@ static struct platform_driver ds1302_platform_driver = {
                .name   = DRV_NAME,
                .owner  = THIS_MODULE,
        },
-       .remove         = __exit_p(ds1302_rtc_remove),
+       .remove         = __devexit_p(ds1302_rtc_remove),
 };
 
 static int __init ds1302_rtc_init(void)