mfd/rtc/gpio: twl: No need to allocate bigger buffer for write

Since the twl-core has been converted to use regmap it is no longer needed
to allocate bigger buffer for data when writing to twl.

CC: Grant Likely <grant.likely@secretlab.ca>
CC: Alessandro Zummo <a.zummo@towertech.it>
Acked-by: Linus Walleij <linus.walleij@linaro.org>
Acked-by: Tero Kristo <t-kristo@ti.com>
Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com>
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>

3 files changed, 7 insertions, 12 deletions

diff --git a/drivers/mfd/twl-core.c b/drivers/mfd/twl-core.c
index 5043f505a230..a55ab15ecf1a 100644
--- a/drivers/mfd/twl-core.c
+++ b/drivers/mfd/twl-core.c
@@ -344,7 +344,7 @@ int twl_i2c_write(u8 mod_no, u8 *value, u8 reg, unsigned num_bytes)
         twl = &twl_modules[sid];
 
         ret = regmap_bulk_write(twl->regmap, twl_map[mod_no].base + reg,
-                                &value[1], num_bytes);
+                                value, num_bytes);
 
         if (ret)
                 pr_err("%s: Write failed (mod %d, reg 0x%02x count %d)\n",
@@ -406,12 +406,7 @@ EXPORT_SYMBOL(twl_i2c_read);
  */
 int twl_i2c_write_u8(u8 mod_no, u8 value, u8 reg)
 {
-
-        /* 2 bytes offset 1 contains the data offset 0 is used by i2c_write */
-        u8 temp_buffer[2] = { 0 };
-        /* offset 1 contains the data */
-        temp_buffer[1] = value;
-        return twl_i2c_write(mod_no, temp_buffer, reg, 1);
+        return twl_i2c_write(mod_no, &value, reg, 1);
 }
 EXPORT_SYMBOL(twl_i2c_write_u8);
 
diff --git a/drivers/mfd/twl4030-irq.c b/drivers/mfd/twl4030-irq.c
index ad733d76207a..e900402633f5 100644
--- a/drivers/mfd/twl4030-irq.c
+++ b/drivers/mfd/twl4030-irq.c
@@ -501,7 +501,7 @@ static void twl4030_sih_bus_sync_unlock(struct irq_data *data)
                 } imr;
 
                 /* byte[0] gets overwritten as we write ... */
-                imr.word = cpu_to_le32(agent->imr << 8);
+                imr.word = cpu_to_le32(agent->imr);
                 agent->imr_change_pending = false;
 
                 /* write the whole mask ... simpler than subsetting it */
@@ -526,7 +526,7 @@ static void twl4030_sih_bus_sync_unlock(struct irq_data *data)
                  * any processor on the other IRQ line, EDR registers are
                  * shared.
                  */
-                status = twl_i2c_read(sih->module, bytes + 1,
+                status = twl_i2c_read(sih->module, bytes,
                                 sih->edr_offset, sih->bytes_edr);
                 if (status) {
                         pr_err("twl4030: %s, %s --> %d\n", __func__,
@@ -538,7 +538,7 @@ static void twl4030_sih_bus_sync_unlock(struct irq_data *data)
                 while (edge_change) {
                         int             i = fls(edge_change) - 1;
                         struct irq_data *idata;
-                        int             byte = 1 + (i >> 2);
+                        int             byte = i >> 2;
                         int             off = (i & 0x3) * 2;
                         unsigned int    type;
 
diff --git a/drivers/mfd/twl6030-irq.c b/drivers/mfd/twl6030-irq.c
index b76902f1e44a..277a8dba42d5 100644
--- a/drivers/mfd/twl6030-irq.c
+++ b/drivers/mfd/twl6030-irq.c
@@ -355,7 +355,7 @@ int twl6030_init_irq(struct device *dev, int irq_num)
         static struct irq_chip  twl6030_irq_chip;
         int                     status = 0;
         int                     i;
-        u8                      mask[4];
+        u8                      mask[3];
 
         nr_irqs = TWL6030_NR_IRQS;
 
@@ -370,9 +370,9 @@ int twl6030_init_irq(struct device *dev, int irq_num)
 
         irq_end = irq_base + nr_irqs;
 
+        mask[0] = 0xFF;
         mask[1] = 0xFF;
         mask[2] = 0xFF;
-        mask[3] = 0xFF;
 
         /* mask all int lines */
         twl_i2c_write(TWL_MODULE_PIH, &mask[0], REG_INT_MSK_LINE_A, 3);