Merge branch 'devel' of master.kernel.org:/home/rmk/linux-2.6-serial

[linux-2.6] / drivers / rtc / rtc-v3020.c

diff --git a/drivers/rtc/rtc-v3020.c b/drivers/rtc/rtc-v3020.c
index a40f400acff6b814401228ba550f54e92aeddfda..09b714f1cdc39f9dedb4cad38b5b036677a0d9dd 100644 (file)
--- a/drivers/rtc/rtc-v3020.c
+++ b/drivers/rtc/rtc-v3020.c
@@ -149,7 +149,7 @@ static int v3020_set_time(struct device *dev, struct rtc_time *dt)
        return 0;
 }
 
-static struct rtc_class_ops v3020_rtc_ops = {
+static const struct rtc_class_ops v3020_rtc_ops = {
        .read_time      = v3020_read_time,
        .set_time       = v3020_set_time,
 };
@@ -169,9 +169,6 @@ static int rtc_probe(struct platform_device *pdev)
        if (pdev->resource[0].flags != IORESOURCE_MEM)
                return -EBUSY;
 
-       if (pdev == NULL)
-               return -EBUSY;
-
        chip = kzalloc(sizeof *chip, GFP_KERNEL);
        if (!chip)
                return -ENOMEM;