Merge with /pub/scm/linux/kernel/git/torvalds/linux-2.6.git

[linux-2.6-omap-h63xx.git] / drivers / rtc / rtc-test.c

diff --git a/drivers/rtc/rtc-test.c b/drivers/rtc/rtc-test.c
index 43d107487820aea0adaff9aae941881bc7d093f9..e1fa5fe7901f900167b448997cb4f4373a85e892 100644 (file)
--- a/drivers/rtc/rtc-test.c
+++ b/drivers/rtc/rtc-test.c
@@ -49,7 +49,6 @@ static int test_rtc_proc(struct device *dev, struct seq_file *seq)
 {
        struct platform_device *plat_dev = to_platform_device(dev);
 
-       seq_printf(seq, "24hr\t\t: yes\n");
        seq_printf(seq, "test\t\t: yes\n");
        seq_printf(seq, "id\t\t: %d\n", plat_dev->id);
 
@@ -72,7 +71,7 @@ static int test_rtc_ioctl(struct device *dev, unsigned int cmd,
                return 0;
 
        default:
-               return -EINVAL;
+               return -ENOIOCTLCMD;
        }
 }
 
@@ -120,8 +119,6 @@ static int test_probe(struct platform_device *plat_dev)
                                                &test_rtc_ops, THIS_MODULE);
        if (IS_ERR(rtc)) {
                err = PTR_ERR(rtc);
-               dev_err(&plat_dev->dev,
-                       "unable to register the class device\n");
                return err;
        }
        device_create_file(&plat_dev->dev, &dev_attr_irq);