Patched in Tegra support.

1 files changed, 26 insertions, 80 deletions

diff --git a/drivers/rtc/rtc-x1205.c b/drivers/rtc/rtc-x1205.c
index f36e59c6bc0..b00aad2620d 100644
--- a/drivers/rtc/rtc-x1205.c
+++ b/drivers/rtc/rtc-x1205.c
@@ -21,7 +21,6 @@
 #include <linux/bcd.h>
 #include <linux/rtc.h>
 #include <linux/delay.h>
-#include <linux/module.h>
 
 #define DRV_VERSION "1.0.8"
 
@@ -97,17 +96,8 @@ static int x1205_get_datetime(struct i2c_client *client, struct rtc_time *tm,
         int i;
 
         struct i2c_msg msgs[] = {
-                {/* setup read ptr */
-                        .addr = client->addr,
-                        .len = 2,
-                        .buf = dt_addr
-                },
-                {/* read date */
-                        .addr = client->addr,
-                        .flags = I2C_M_RD,
-                        .len = 8,
-                        .buf = buf
-                },
+                { client->addr, 0, 2, dt_addr },        /* setup read ptr */
+                { client->addr, I2C_M_RD, 8, buf },     /* read date */
         };
 
         /* read date registers */
@@ -151,17 +141,8 @@ static int x1205_get_status(struct i2c_client *client, unsigned char *sr)
         static unsigned char sr_addr[2] = { 0, X1205_REG_SR };
 
         struct i2c_msg msgs[] = {
-                {     /* setup read ptr */
-                        .addr = client->addr,
-                        .len = 2,
-                        .buf = sr_addr
-                },
-                {    /* read status */
-                        .addr = client->addr,
-                        .flags = I2C_M_RD,
-                        .len = 1,
-                        .buf = sr
-                },
+                { client->addr, 0, 2, sr_addr },        /* setup read ptr */
+                { client->addr, I2C_M_RD, 1, sr },      /* read status */
         };
 
         /* read status register */
@@ -297,17 +278,8 @@ static int x1205_get_dtrim(struct i2c_client *client, int *trim)
         static unsigned char dtr_addr[2] = { 0, X1205_REG_DTR };
 
         struct i2c_msg msgs[] = {
-                {       /* setup read ptr */
-                        .addr = client->addr,
-                        .len = 2,
-                        .buf = dtr_addr
-                },
-                {      /* read dtr */
-                        .addr = client->addr,
-                        .flags = I2C_M_RD,
-                        .len = 1,
-                        .buf = &dtr
-                },
+                { client->addr, 0, 2, dtr_addr },       /* setup read ptr */
+                { client->addr, I2C_M_RD, 1, &dtr },    /* read dtr */
         };
 
         /* read dtr register */
@@ -338,17 +310,8 @@ static int x1205_get_atrim(struct i2c_client *client, int *trim)
         static unsigned char atr_addr[2] = { 0, X1205_REG_ATR };
 
         struct i2c_msg msgs[] = {
-                {/* setup read ptr */
-                        .addr = client->addr,
-                        .len = 2,
-                        .buf = atr_addr
-                },
-                {/* read atr */
-                        .addr = client->addr,
-                        .flags = I2C_M_RD,
-                        .len = 1,
-                        .buf = &atr
-                },
+                { client->addr, 0, 2, atr_addr },       /* setup read ptr */
+                { client->addr, I2C_M_RD, 1, &atr },    /* read atr */
         };
 
         /* read atr register */
@@ -417,17 +380,8 @@ static int x1205_validate_client(struct i2c_client *client)
                 unsigned char addr[2] = { 0, probe_zero_pattern[i] };
 
                 struct i2c_msg msgs[2] = {
-                        {
-                                .addr = client->addr,
-                                .len = 2,
-                                .buf = addr
-                        },
-                        {
-                                .addr = client->addr,
-                                .flags = I2C_M_RD,
-                                .len = 1,
-                                .buf = &buf
-                        },
+                        { client->addr, 0, 2, addr },
+                        { client->addr, I2C_M_RD, 1, &buf },
                 };
 
                 if ((xfer = i2c_transfer(client->adapter, msgs, 2)) != 2) {
@@ -454,17 +408,8 @@ static int x1205_validate_client(struct i2c_client *client)
                 unsigned char addr[2] = { 0, probe_limits_pattern[i].reg };
 
                 struct i2c_msg msgs[2] = {
-                        {
-                                .addr = client->addr,
-                                .len = 2,
-                                .buf = addr
-                        },
-                        {
-                                .addr = client->addr,
-                                .flags = I2C_M_RD,
-                                .len = 1,
-                                .buf = &reg
-                        },
+                        { client->addr, 0, 2, addr },
+                        { client->addr, I2C_M_RD, 1, &reg },
                 };
 
                 if ((xfer = i2c_transfer(client->adapter, msgs, 2)) != 2) {
@@ -498,18 +443,8 @@ static int x1205_rtc_read_alarm(struct device *dev, struct rtc_wkalrm *alrm)
         static unsigned char int_addr[2] = { 0, X1205_REG_INT };
         struct i2c_client *client = to_i2c_client(dev);
         struct i2c_msg msgs[] = {
-                { /* setup read ptr */
-                        .addr = client->addr,
-                        .len = 2,
-                        .buf = int_addr
-                },
-                {/* read INT register */
-
-                        .addr = client->addr,
-                        .flags = I2C_M_RD,
-                        .len = 1,
-                        .buf = &intreg
-                },
+                { client->addr, 0, 2, int_addr },        /* setup read ptr */
+                { client->addr, I2C_M_RD, 1, &intreg },  /* read INT register */
         };
 
         /* read interrupt register and status register */
@@ -687,7 +622,15 @@ static struct i2c_driver x1205_driver = {
         .id_table       = x1205_id,
 };
 
-module_i2c_driver(x1205_driver);
+static int __init x1205_init(void)
+{
+        return i2c_add_driver(&x1205_driver);
+}
+
+static void __exit x1205_exit(void)
+{
+        i2c_del_driver(&x1205_driver);
+}
 
 MODULE_AUTHOR(
         "Karen Spearel <kas111 at gmail dot com>, "
@@ -695,3 +638,6 @@ MODULE_AUTHOR(
 MODULE_DESCRIPTION("Xicor/Intersil X1205 RTC driver");
 MODULE_LICENSE("GPL");
 MODULE_VERSION(DRV_VERSION);
+
+module_init(x1205_init);
+module_exit(x1205_exit);