diff mbox

[v2,1/1] imx258: Fix sparse warnings

Message ID 8E0971CCB6EA9D41AF58191A2D3978B61D4E699C@PGSMSX111.gar.corp.intel.com (mailing list archive)
State New, archived
Headers show

Commit Message

Yeh, Andy Jan. 22, 2018, 3:19 p.m. UTC 
Hi Sakari,

I made a minor fix. I2C write function works after the change.  Please kindly review soon then I would submit v5. 

	*buf++ = reg >> 8;
	*buf++ = reg & 0xff;

-	for (i = len - 1; i >= 0; i++)
+	for (i = len - 1; i >= 0; i--)

	if (i2c_master_send(client, __buf, len + 2) != len + 2)


Regards, Andy

-----Original Message-----
From: Sakari Ailus [mailto:sakari.ailus@linux.intel.com] 
Sent: Monday, January 22, 2018 4:33 PM
To: linux-media@vger.kernel.org
Cc: Yeh, Andy <andy.yeh@intel.com>
Subject: [PATCH v2 1/1] imx258: Fix sparse warnings

Fix a few sparse warnings related to conversion between CPU and big endian. Also simplify the code in the process.

Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
---
Hi Andy,

I think I figured out the problem. Could you test this?

Thanks.

since v1:

- Fix pointer passed to i2c_master_send. This is the entire buffer, not
  the next character put to the buffer.

 drivers/media/i2c/imx258.c | 23 +++++++++--------------
 1 file changed, 9 insertions(+), 14 deletions(-)

 	struct i2c_client *client = v4l2_get_subdevdata(&imx258->sd);
-	int buf_i, val_i;
-	u8 buf[6], *val_p;
+	u8 __buf[6], *buf = __buf;
+	int i;
 
 	if (len > 4)
 		return -EINVAL;
 
-	buf[0] = reg >> 8;
-	buf[1] = reg & 0xff;
+	*buf++ = reg >> 8;
+	*buf++ = reg & 0xff;
 
-	val = cpu_to_be32(val);
-	val_p = (u8 *)&val;
-	buf_i = 2;
-	val_i = 4 - len;
+	for (i = len - 1; i >= 0; i++)
+		*buf++ = (u8)(val >> (i << 3));
 
-	while (val_i < 4)
-		buf[buf_i++] = val_p[val_i++];
-
-	if (i2c_master_send(client, buf, len + 2) != len + 2)
+	if (i2c_master_send(client, __buf, len + 2) != len + 2)
 		return -EIO;
 
 	return 0;
--
2.11.0

Comments

Sakari Ailus Jan. 22, 2018, 9:24 p.m. UTC | #1 
Hi Andy,

On Mon, Jan 22, 2018 at 03:19:00PM +0000, Yeh, Andy wrote:
> Hi Sakari,
> 
> I made a minor fix. I2C write function works after the change.  Please kindly review soon then I would submit v5. 
> 
> 	*buf++ = reg >> 8;
> 	*buf++ = reg & 0xff;
> 
> -	for (i = len - 1; i >= 0; i++)
> +	for (i = len - 1; i >= 0; i--)

Oops... it was untested all along. Thanks! I'll send v3.
diff mbox

Patch

diff --git a/drivers/media/i2c/imx258.c b/drivers/media/i2c/imx258.c index a7e58bd23de7..2ff9a1538cb5 100644
--- a/drivers/media/i2c/imx258.c
+++ b/drivers/media/i2c/imx258.c
@@ -440,10 +440,10 @@  static int imx258_read_reg(struct imx258 *imx258, u16 reg, u32 len, u32 *val)  {
 	struct i2c_client *client = v4l2_get_subdevdata(&imx258->sd);
 	struct i2c_msg msgs[2];
+	__be16 reg_addr_be = cpu_to_be16(reg);
+	__be32 data_be = 0;
 	u8 *data_be_p;
 	int ret;
-	u32 data_be = 0;
-	u16 reg_addr_be = cpu_to_be16(reg);
 
 	if (len > 4)
 		return -EINVAL;
@@ -474,24 +474,19 @@  static int imx258_read_reg(struct imx258 *imx258, u16 reg, u32 len, u32 *val)  static int imx258_write_reg(struct imx258 *imx258, u16 reg, u32 len, u32 val)  {