* [PATCH] mfd: Remove unneeded io_mutex from struct twl6040
@ 2012-07-11 2:06 Axel Lin
2012-07-11 13:24 ` Peter Ujfalusi
2012-07-16 13:27 ` Samuel Ortiz
0 siblings, 2 replies; 3+ messages in thread
From: Axel Lin @ 2012-07-11 2:06 UTC (permalink / raw)
To: SamuelOrtiz; +Cc: Peter Ujfalusi, Misael Lopez Cruz, linux-kernel
Current code has been converted to use regmap APIs, the io_mutex is not needed.
Thus remove the io_mutex.
Signed-off-by: Axel Lin <axel.lin@gmail.com>
---
drivers/mfd/twl6040-core.c | 23 +++--------------------
include/linux/mfd/twl6040.h | 1 -
2 files changed, 3 insertions(+), 21 deletions(-)
diff --git a/drivers/mfd/twl6040-core.c b/drivers/mfd/twl6040-core.c
index 4ded9e7..5f620ae 100644
--- a/drivers/mfd/twl6040-core.c
+++ b/drivers/mfd/twl6040-core.c
@@ -64,19 +64,15 @@ int twl6040_reg_read(struct twl6040 *twl6040, unsigned int reg)
int ret;
unsigned int val;
- mutex_lock(&twl6040->io_mutex);
/* Vibra control registers from cache */
if (unlikely(reg == TWL6040_REG_VIBCTLL ||
reg == TWL6040_REG_VIBCTLR)) {
val = twl6040->vibra_ctrl_cache[VIBRACTRL_MEMBER(reg)];
} else {
ret = regmap_read(twl6040->regmap, reg, &val);
- if (ret < 0) {
- mutex_unlock(&twl6040->io_mutex);
+ if (ret < 0)
return ret;
- }
}
- mutex_unlock(&twl6040->io_mutex);
return val;
}
@@ -86,12 +82,10 @@ int twl6040_reg_write(struct twl6040 *twl6040, unsigned int reg, u8 val)
{
int ret;
- mutex_lock(&twl6040->io_mutex);
ret = regmap_write(twl6040->regmap, reg, val);
/* Cache the vibra control registers */
if (reg == TWL6040_REG_VIBCTLL || reg == TWL6040_REG_VIBCTLR)
twl6040->vibra_ctrl_cache[VIBRACTRL_MEMBER(reg)] = val;
- mutex_unlock(&twl6040->io_mutex);
return ret;
}
@@ -99,23 +93,13 @@ EXPORT_SYMBOL(twl6040_reg_write);
int twl6040_set_bits(struct twl6040 *twl6040, unsigned int reg, u8 mask)
{
- int ret;
-
- mutex_lock(&twl6040->io_mutex);
- ret = regmap_update_bits(twl6040->regmap, reg, mask, mask);
- mutex_unlock(&twl6040->io_mutex);
- return ret;
+ return regmap_update_bits(twl6040->regmap, reg, mask, mask);
}
EXPORT_SYMBOL(twl6040_set_bits);
int twl6040_clear_bits(struct twl6040 *twl6040, unsigned int reg, u8 mask)
{
- int ret;
-
- mutex_lock(&twl6040->io_mutex);
- ret = regmap_update_bits(twl6040->regmap, reg, mask, 0);
- mutex_unlock(&twl6040->io_mutex);
- return ret;
+ return regmap_update_bits(twl6040->regmap, reg, mask, 0);
}
EXPORT_SYMBOL(twl6040_clear_bits);
@@ -573,7 +557,6 @@ static int __devinit twl6040_probe(struct i2c_client *client,
twl6040->irq = client->irq;
mutex_init(&twl6040->mutex);
- mutex_init(&twl6040->io_mutex);
init_completion(&twl6040->ready);
twl6040->rev = twl6040_reg_read(twl6040, TWL6040_REG_ASICREV);
diff --git a/include/linux/mfd/twl6040.h b/include/linux/mfd/twl6040.h
index 6659487..dcc0e12 100644
--- a/include/linux/mfd/twl6040.h
+++ b/include/linux/mfd/twl6040.h
@@ -206,7 +206,6 @@ struct twl6040 {
struct regmap *regmap;
struct regulator_bulk_data supplies[2]; /* supplies for vio, v2v1 */
struct mutex mutex;
- struct mutex io_mutex;
struct mutex irq_mutex;
struct mfd_cell cells[TWL6040_CELLS];
struct completion ready;
--
1.7.9.5
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH] mfd: Remove unneeded io_mutex from struct twl6040
2012-07-11 2:06 [PATCH] mfd: Remove unneeded io_mutex from struct twl6040 Axel Lin
@ 2012-07-11 13:24 ` Peter Ujfalusi
2012-07-16 13:27 ` Samuel Ortiz
1 sibling, 0 replies; 3+ messages in thread
From: Peter Ujfalusi @ 2012-07-11 13:24 UTC (permalink / raw)
To: Axel Lin; +Cc: SamuelOrtiz, Misael Lopez Cruz, linux-kernel
On 07/11/2012 04:06 AM, Axel Lin wrote:
> Current code has been converted to use regmap APIs, the io_mutex is not needed.
> Thus remove the io_mutex.
>
> Signed-off-by: Axel Lin <axel.lin@gmail.com>
Thanks for cleanup,
Acked-by: Peter Ujfalusi <peter.ujfalusi@ti.com>
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] mfd: Remove unneeded io_mutex from struct twl6040
2012-07-11 2:06 [PATCH] mfd: Remove unneeded io_mutex from struct twl6040 Axel Lin
2012-07-11 13:24 ` Peter Ujfalusi
@ 2012-07-16 13:27 ` Samuel Ortiz
1 sibling, 0 replies; 3+ messages in thread
From: Samuel Ortiz @ 2012-07-16 13:27 UTC (permalink / raw)
To: Axel Lin; +Cc: Peter Ujfalusi, Misael Lopez Cruz, linux-kernel
Hi Axel,
On Wed, Jul 11, 2012 at 10:06:34AM +0800, Axel Lin wrote:
> Current code has been converted to use regmap APIs, the io_mutex is not needed.
> Thus remove the io_mutex.
>
> Signed-off-by: Axel Lin <axel.lin@gmail.com>
> ---
> drivers/mfd/twl6040-core.c | 23 +++--------------------
> include/linux/mfd/twl6040.h | 1 -
> 2 files changed, 3 insertions(+), 21 deletions(-)
Patch applied thanks.
Cheers,
Samuel.
--
Intel Open Source Technology Centre
http://oss.intel.com/
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2012-07-16 13:27 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2012-07-11 2:06 [PATCH] mfd: Remove unneeded io_mutex from struct twl6040 Axel Lin
2012-07-11 13:24 ` Peter Ujfalusi
2012-07-16 13:27 ` Samuel Ortiz
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.