diff options
author | Peter Ujfalusi <peter.ujfalusi@ti.com> | 2012-11-13 03:28:45 -0500 |
---|---|---|
committer | Samuel Ortiz <sameo@linux.intel.com> | 2012-11-21 10:08:00 -0500 |
commit | 14591d888e35c12b15eccf54e490c7769eb6d6d2 (patch) | |
tree | 16631920135867d55fbdace5073cd89b61446c72 /drivers/mfd/twl4030-irq.c | |
parent | 2473d25a2f61985f8980c7c3d41cb85da1abea0f (diff) |
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>
Diffstat (limited to 'drivers/mfd/twl4030-irq.c')
-rw-r--r-- | drivers/mfd/twl4030-irq.c | 6 |
1 files changed, 3 insertions, 3 deletions
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) | |||
501 | } imr; | 501 | } imr; |
502 | 502 | ||
503 | /* byte[0] gets overwritten as we write ... */ | 503 | /* byte[0] gets overwritten as we write ... */ |
504 | imr.word = cpu_to_le32(agent->imr << 8); | 504 | imr.word = cpu_to_le32(agent->imr); |
505 | agent->imr_change_pending = false; | 505 | agent->imr_change_pending = false; |
506 | 506 | ||
507 | /* write the whole mask ... simpler than subsetting it */ | 507 | /* write the whole mask ... simpler than subsetting it */ |
@@ -526,7 +526,7 @@ static void twl4030_sih_bus_sync_unlock(struct irq_data *data) | |||
526 | * any processor on the other IRQ line, EDR registers are | 526 | * any processor on the other IRQ line, EDR registers are |
527 | * shared. | 527 | * shared. |
528 | */ | 528 | */ |
529 | status = twl_i2c_read(sih->module, bytes + 1, | 529 | status = twl_i2c_read(sih->module, bytes, |
530 | sih->edr_offset, sih->bytes_edr); | 530 | sih->edr_offset, sih->bytes_edr); |
531 | if (status) { | 531 | if (status) { |
532 | pr_err("twl4030: %s, %s --> %d\n", __func__, | 532 | pr_err("twl4030: %s, %s --> %d\n", __func__, |
@@ -538,7 +538,7 @@ static void twl4030_sih_bus_sync_unlock(struct irq_data *data) | |||
538 | while (edge_change) { | 538 | while (edge_change) { |
539 | int i = fls(edge_change) - 1; | 539 | int i = fls(edge_change) - 1; |
540 | struct irq_data *idata; | 540 | struct irq_data *idata; |
541 | int byte = 1 + (i >> 2); | 541 | int byte = i >> 2; |
542 | int off = (i & 0x3) * 2; | 542 | int off = (i & 0x3) * 2; |
543 | unsigned int type; | 543 | unsigned int type; |
544 | 544 | ||