Merge remote-tracking branch 'stable/linux-3.0.y' into develop-3.0

[firefly-linux-kernel-4.4.55.git] / drivers / rtc / rtc-m41t66.c

diff --git a/drivers/rtc/rtc-m41t66.c b/drivers/rtc/rtc-m41t66.c
index 2e1b4b6a4c2945cc9602f64a39d55161a9651a3f..f4dee44b758630fed1977710623a4342185b4788 100755 (executable)
--- a/drivers/rtc/rtc-m41t66.c
+++ b/drivers/rtc/rtc-m41t66.c
@@ -101,9 +101,9 @@
 \r
 \r
 #define DRV_VERSION "0.05"\r
-#define DRV_NAME  "rtc-M41T62"\r
-#if 0\r
-#define DBG(x...)      printk(KERN_INFO  "rtc-M41T62:" x)\r
+#define DRV_NAME  "rtc-M41T66"\r
+#if 1\r
+#define DBG   printk//(x...)   printk(KERN_INFO  "rtc-M41T62:" x)\r
 #else\r
 #define DBG(x...)\r
 #endif\r
@@ -663,7 +663,7 @@ static int m41t62_sysfs_register(struct device *dev)
  */\r
 static int __devinit m41t62_probe(struct i2c_client *client, const struct i2c_device_id *id)\r
 {\r
-       //DBG("%s>>>>>>>>>>>>>client->flags:%d\n",__func__,client->flags);\r
+       printk("%s>>>>>>>>>>>>>client->flags:%d\n",__func__,client->flags);\r
        int rc = 0;\r
        struct rock_rtc *rk_rtc = NULL;\r
        struct rtc_device *rtc = NULL;\r
@@ -794,8 +794,12 @@ static struct i2c_driver m41t62_driver = {
 \r
 static int __init m41t62_rtc_init(void)\r
 {\r
-       DBG("%s>>>>>>>>>\n",__func__);\r
-       return i2c_add_driver(&m41t62_driver);\r
+       int ret;\r
+       \r
+       printk("%s\n",__func__);\r
+       ret = i2c_add_driver(&m41t62_driver);\r
+       printk("%s:return = %d\n",__func__,ret);\r
+       return ret;\r
 }\r
 \r
 static void __exit m41t62_rtc_exit(void)\r