1 files changed, 28 insertions, 59 deletions

diff --git a/drivers/staging/lirc/lirc_zilog.c b/drivers/staging/lirc/lirc_zilog.c
index 85e312f33513..00f2e7d3b3e5 100644
--- a/drivers/staging/lirc/lirc_zilog.c
+++ b/drivers/staging/lirc/lirc_zilog.c
@@ -62,7 +62,7 @@
 
 struct IR_rx {
         /* RX device */
-        struct i2c_client c_rx;
+        struct i2c_client *c;
 
         /* RX device buffer & lock */
         struct lirc_buffer buf;
@@ -81,7 +81,7 @@ struct IR_rx {
 
 struct IR_tx {
         /* TX device */
-        struct i2c_client c_tx;
+        struct i2c_client *c;
 
         /* TX additional actions needed */
         int need_boot;
@@ -132,9 +132,6 @@ static struct mutex tx_data_lock;
                                         ## args)
 #define zilog_error(s, args...) printk(KERN_ERR KBUILD_MODNAME ": " s, ## args)
 
-#define ZILOG_HAUPPAUGE_IR_RX_NAME "Zilog/Hauppauge IR RX"
-#define ZILOG_HAUPPAUGE_IR_TX_NAME "Zilog/Hauppauge IR TX"
-
 /* module parameters */
 static int debug;       /* debug output */
 static int disable_rx;  /* disable RX device */
@@ -181,7 +178,7 @@ static int add_to_buf(struct IR *ir)
                  * Send random "poll command" (?)  Windows driver does this
                  * and it is a good point to detect chip failure.
                  */
-                ret = i2c_master_send(&rx->c_rx, sendbuf, 1);
+                ret = i2c_master_send(rx->c, sendbuf, 1);
                 if (ret != 1) {
                         zilog_error("i2c_master_send failed with %d\n", ret);
                         if (failures >= 3) {
@@ -205,7 +202,7 @@ static int add_to_buf(struct IR *ir)
                         continue;
                 }
 
-                ret = i2c_master_recv(&rx->c_rx, keybuf, sizeof(keybuf));
+                ret = i2c_master_recv(rx->c, keybuf, sizeof(keybuf));
                 mutex_unlock(&ir->ir_lock);
                 if (ret != sizeof(keybuf)) {
                         zilog_error("i2c_master_recv failed with %d -- "
@@ -315,9 +312,9 @@ static int set_use_inc(void *data)
          * must be possible even when the device is open
          */
         if (ir->rx != NULL)
-                i2c_use_client(&ir->rx->c_rx);
+                i2c_use_client(ir->rx->c);
         if (ir->tx != NULL)
-                i2c_use_client(&ir->tx->c_tx);
+                i2c_use_client(ir->tx->c);
 
         return 0;
 }
@@ -327,9 +324,9 @@ static void set_use_dec(void *data)
         struct IR *ir = data;
 
         if (ir->rx)
-                i2c_release_client(&ir->rx->c_rx);
+                i2c_release_client(ir->rx->c);
         if (ir->tx)
-                i2c_release_client(&ir->tx->c_tx);
+                i2c_release_client(ir->tx->c);
         if (ir->l.owner != NULL)
                 module_put(ir->l.owner);
 }
@@ -482,7 +479,7 @@ static int send_data_block(struct IR_tx *tx, unsigned char *data_block)
                         buf[1 + j] = data_block[i + j];
                 dprintk("%02x %02x %02x %02x %02x",
                         buf[0], buf[1], buf[2], buf[3], buf[4]);
-                ret = i2c_master_send(&tx->c_tx, buf, tosend + 1);
+                ret = i2c_master_send(tx->c, buf, tosend + 1);
                 if (ret != tosend + 1) {
                         zilog_error("i2c_master_send failed with %d\n", ret);
                         return ret < 0 ? ret : -EFAULT;
@@ -506,19 +503,19 @@ static int send_boot_data(struct IR_tx *tx)
         /* kick it off? */
         buf[0] = 0x00;
         buf[1] = 0x20;
-        ret = i2c_master_send(&tx->c_tx, buf, 2);
+        ret = i2c_master_send(tx->c, buf, 2);
         if (ret != 2) {
                 zilog_error("i2c_master_send failed with %d\n", ret);
                 return ret < 0 ? ret : -EFAULT;
         }
-        ret = i2c_master_send(&tx->c_tx, buf, 1);
+        ret = i2c_master_send(tx->c, buf, 1);
         if (ret != 1) {
                 zilog_error("i2c_master_send failed with %d\n", ret);
                 return ret < 0 ? ret : -EFAULT;
         }
 
         /* Here comes the firmware version... (hopefully) */
-        ret = i2c_master_recv(&tx->c_tx, buf, 4);
+        ret = i2c_master_recv(tx->c, buf, 4);
         if (ret != 4) {
                 zilog_error("i2c_master_recv failed with %d\n", ret);
                 return 0;
@@ -573,7 +570,7 @@ static int fw_load(struct IR_tx *tx)
         }
 
         /* Request codeset data file */
-        ret = request_firmware(&fw_entry, "haup-ir-blaster.bin", &tx->c_tx.dev);
+        ret = request_firmware(&fw_entry, "haup-ir-blaster.bin", &tx->c->dev);
         if (ret != 0) {
                 zilog_error("firmware haup-ir-blaster.bin not available "
                             "(%d)\n", ret);
@@ -822,19 +819,19 @@ static int send_code(struct IR_tx *tx, unsigned int code, unsigned int key)
         /* Send data block length? */
         buf[0] = 0x00;
         buf[1] = 0x40;
-        ret = i2c_master_send(&tx->c_tx, buf, 2);
+        ret = i2c_master_send(tx->c, buf, 2);
         if (ret != 2) {
                 zilog_error("i2c_master_send failed with %d\n", ret);
                 return ret < 0 ? ret : -EFAULT;
         }
-        ret = i2c_master_send(&tx->c_tx, buf, 1);
+        ret = i2c_master_send(tx->c, buf, 1);
         if (ret != 1) {
                 zilog_error("i2c_master_send failed with %d\n", ret);
                 return ret < 0 ? ret : -EFAULT;
         }
 
         /* Send finished download? */
-        ret = i2c_master_recv(&tx->c_tx, buf, 1);
+        ret = i2c_master_recv(tx->c, buf, 1);
         if (ret != 1) {
                 zilog_error("i2c_master_recv failed with %d\n", ret);
                 return ret < 0 ? ret : -EFAULT;
@@ -848,7 +845,7 @@ static int send_code(struct IR_tx *tx, unsigned int code, unsigned int key)
         /* Send prepare command? */
         buf[0] = 0x00;
         buf[1] = 0x80;
-        ret = i2c_master_send(&tx->c_tx, buf, 2);
+        ret = i2c_master_send(tx->c, buf, 2);
         if (ret != 2) {
                 zilog_error("i2c_master_send failed with %d\n", ret);
                 return ret < 0 ? ret : -EFAULT;
@@ -873,7 +870,7 @@ static int send_code(struct IR_tx *tx, unsigned int code, unsigned int key)
         for (i = 0; i < 20; ++i) {
                 set_current_state(TASK_UNINTERRUPTIBLE);
                 schedule_timeout((50 * HZ + 999) / 1000);