summaryrefslogtreecommitdiff
path: root/drivers/mfd
diff options
context:
space:
mode:
authorvenu byravarasu <vbyravarasu@nvidia.com>2011-12-14 16:39:58 +0530
committerVarun Wadekar <vwadekar@nvidia.com>2011-12-21 12:06:22 +0530
commit344518620f0a8308be971486d1daafa39dd41b5b (patch)
tree058e811b3c2a8fb575c52cb39a5363223bc16433 /drivers/mfd
parent5deba1d3911c7e25ba1d97a80d3ca6c70f73e9db (diff)
mfd: ricoh583: update API prototype
With this commit below changes to ricoh583 MFD are done: 1. Updating cache copy of int enable register. 2. Changing the prototypes for bulk read & write APIs. 3. Updating rtc platform data structure. bug 902137 Change-Id: I616d86628addaaa04f3faec035120bd6f9569603 Signed-off-by: venu byravarasu <vbyravarasu@nvidia.com> Reviewed-on: http://git-master/r/70010 Reviewed-by: Automatic_Commit_Validation_User Reviewed-by: Laxman Dewangan <ldewangan@nvidia.com>
Diffstat (limited to 'drivers/mfd')
-rw-r--r--drivers/mfd/ricoh583.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/mfd/ricoh583.c b/drivers/mfd/ricoh583.c
index 97070517e5e9..a29053ebaf86 100644
--- a/drivers/mfd/ricoh583.c
+++ b/drivers/mfd/ricoh583.c
@@ -309,7 +309,7 @@ int ricoh583_write(struct device *dev, u8 reg, uint8_t val)
}
EXPORT_SYMBOL_GPL(ricoh583_write);
-int ricoh583_bulk_writes(struct device *dev, u8 reg, int len, uint8_t *val)
+int ricoh583_bulk_writes(struct device *dev, u8 reg, u8 len, uint8_t *val)
{
struct ricoh583 *ricoh583 = dev_get_drvdata(dev);
int ret = 0;
@@ -328,7 +328,7 @@ int ricoh583_read(struct device *dev, u8 reg, uint8_t *val)
}
EXPORT_SYMBOL_GPL(ricoh583_read);
-int ricoh583_bulk_reads(struct device *dev, u8 reg, int len, uint8_t *val)
+int ricoh583_bulk_reads(struct device *dev, u8 reg, u8 len, uint8_t *val)
{
return __ricoh583_bulk_reads(to_i2c_client(dev), reg, len, val);
}
@@ -750,7 +750,7 @@ static void ricoh583_irq_sync_unlock(struct irq_data *irq_data)
if (ricoh583->intc_inten_reg != ricoh583->intc_inten_cache) {
if (!WARN_ON(__ricoh583_write(ricoh583->client,
RICOH583_INTC_INTEN, ricoh583->intc_inten_reg)))
- ricoh583->intc_inten_reg = ricoh583->intc_inten_cache;
+ ricoh583->intc_inten_cache = ricoh583->intc_inten_reg;
}
mutex_unlock(&ricoh583->irq_lock);