[PATCH 5/8] lp8727_charger: move the mutex code

[Kim, Milo]

use the mutex only when the write access to the registers
in the delayed work.

Signed-off-by: Milo(Woogyom) Kim <milo.kim@xxxxxx>
---
 drivers/power/lp8727_charger.c |   18 ++++++------------
 1 file changed, 6 insertions(+), 12 deletions(-)

diff --git a/drivers/power/lp8727_charger.c b/drivers/power/lp8727_charger.c
index 742c33a..0b0094a 100644
--- a/drivers/power/lp8727_charger.c
+++ b/drivers/power/lp8727_charger.c
@@ -84,7 +84,7 @@ struct lp8727_psy {
 struct lp8727_chg {
 	struct device *dev;
 	struct i2c_client *client;
-	struct mutex xfer_lock;
+	struct mutex lock;
 
 	/* interrupt handling */
 	int irq;
@@ -104,9 +104,7 @@ static int lp8727_read_bytes(struct lp8727_chg *pchg, u8 reg, u8 *data, u8 len)
 {
 	s32 ret;
 
-	mutex_lock(&pchg->xfer_lock);
 	ret = i2c_smbus_read_i2c_block_data(pchg->client, reg, len, data);
-	mutex_unlock(&pchg->xfer_lock);
 
 	return (ret != len) ? -EIO : 0;
 }
@@ -116,15 +114,9 @@ static inline int lp8727_read_byte(struct lp8727_chg *pchg, u8 reg, u8 *data)
 	return lp8727_read_bytes(pchg, reg, data, 1);
 }
 
-static int lp8727_write_byte(struct lp8727_chg *pchg, u8 reg, u8 data)
+static inline int lp8727_write_byte(struct lp8727_chg *pchg, u8 reg, u8 data)
 {
-	int ret;
-
-	mutex_lock(&pchg->xfer_lock);
-	ret = i2c_smbus_write_byte_data(pchg->client, reg, data);
-	mutex_unlock(&pchg->xfer_lock);
-
-	return ret;
+	return i2c_smbus_write_byte_data(pchg->client, reg, data);
 }
 
 static int lp8727_is_charger_attached(const char *name, int id)
@@ -239,8 +231,10 @@ static void lp8727_delayed_func(struct work_struct *_work)
 	idno = intstat[0] & IDNO;
 	vbus = intstat[0] & VBUS;
 
+	mutex_lock(&pchg->lock);
 	lp8727_id_detection(pchg, idno, vbus);
 	lp8727_enable_chgdet(pchg);
+	mutex_unlock(&pchg->lock);
 
 	power_supply_changed(&pchg->psy->ac);
 	power_supply_changed(&pchg->psy->usb);
@@ -479,7 +473,7 @@ static int lp8727_probe(struct i2c_client *cl, const struct i2c_device_id *id)
 	pchg->pdata = cl->dev.platform_data;
 	i2c_set_clientdata(cl, pchg);
 
-	mutex_init(&pchg->xfer_lock);
+	mutex_init(&pchg->lock);
 
 	ret = lp8727_init_device(pchg);
 	if (ret) {
-- 
1.7.9.5


Best Regards,
Milo


--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/