Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 815f55f2 authored by Jean Delvare's avatar Jean Delvare Committed by Greg Kroah-Hartman
Browse files

[PATCH] I2C: Remove redundancy from i2c-core.c 



Call i2c_transfer() from i2c_master_send() and i2c_master_recv() to
avoid the redundant code that was in all three functions.  It also
removes unnecessary debug statements as suggested by Jean Delvare.

This is important for the non-blocking interfaces because they will
have to handle a non-blocking interface in this area.  Having it in
one place greatly simplifies the changes.

Signed-off-by: default avatarCorey Minyard <minyard@acm.org>
Signed-off-by: default avatarJean Delvare <khali@linux-fr.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 30aedcb3

drivers/i2c/i2c-core.c

+20 −44
Original line number Diff line number Diff line
@@ -611,27 +611,16 @@ int i2c_master_send(struct i2c_client *client,const char *buf ,int count) 
	struct i2c_adapter *adap=client->adapter;

	struct i2c_msg msg;



	if (client->adapter->algo->master_xfer) {

	msg.addr = client->addr;

	msg.flags = client->flags & I2C_M_TEN;

	msg.len = count;

	msg.buf = (char *)buf;

	

		dev_dbg(&client->adapter->dev, "master_send: writing %d bytes.\n",

			count);

	ret = i2c_transfer(adap, &msg, 1);



		down(&adap->bus_lock);

		ret = adap->algo->master_xfer(adap,&msg,1);

		up(&adap->bus_lock);



		/* if everything went ok (i.e. 1 msg transmitted), return #bytes

		 * transmitted, else error code.

		 */

	/* If everything went ok (i.e. 1 msg transmitted), return #bytes

	   transmitted, else error code. */

	return (ret == 1) ? count : ret;

	} else {

		dev_err(&client->adapter->dev, "I2C level transfers not supported\n");

		return -ENOSYS;

	}

}



int i2c_master_recv(struct i2c_client *client, char *buf ,int count)
@@ -639,31 +628,18 @@ int i2c_master_recv(struct i2c_client *client, char *buf ,int count) 
	struct i2c_adapter *adap=client->adapter;

	struct i2c_msg msg;

	int ret;

	if (client->adapter->algo->master_xfer) {



	msg.addr = client->addr;

	msg.flags = client->flags & I2C_M_TEN;

	msg.flags |= I2C_M_RD;

	msg.len = count;

	msg.buf = buf;



		dev_dbg(&client->adapter->dev, "master_recv: reading %d bytes.\n",

			count);

	ret = i2c_transfer(adap, &msg, 1);



		down(&adap->bus_lock);

		ret = adap->algo->master_xfer(adap,&msg,1);

		up(&adap->bus_lock);

	

		dev_dbg(&client->adapter->dev, "master_recv: return:%d (count:%d, addr:0x%02x)\n",

			ret, count, client->addr);

	

		/* if everything went ok (i.e. 1 msg transmitted), return #bytes

	 	* transmitted, else error code.

	 	*/

	/* If everything went ok (i.e. 1 msg transmitted), return #bytes

	   transmitted, else error code. */

	return (ret == 1) ? count : ret;

	} else {

		dev_err(&client->adapter->dev, "I2C level transfers not supported\n");

		return -ENOSYS;

	}

}