[PATCH] char/tpm: Convert struct i2c_msg initialization to C99 format

[PATCH] char/tpm: Convert struct i2c_msg initialization to C99 format

[Shubhrajyoti D]

Convert the struct i2c_msg initialization to C99 format. This makes
maintaining and editing the code simpler. Also helps once other fields
like transferred are added in future.

Thanks to Julia Lawall <julia.lawall-L2FTfq7BK8M@public.gmane.org>  for automating the conversion

Signed-off-by: Shubhrajyoti D <shubhrajyoti-l0cyMroinI0@public.gmane.org>
---
 drivers/char/tpm/tpm_i2c_infineon.c |   21 ++++++++++++++++++---
 1 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/drivers/char/tpm/tpm_i2c_infineon.c b/drivers/char/tpm/tpm_i2c_infineon.c
index 5a831ae..01b07c7 100644
--- a/drivers/char/tpm/tpm_i2c_infineon.c
+++ b/drivers/char/tpm/tpm_i2c_infineon.c
@@ -90,8 +90,18 @@ static struct i2c_driver tpm_tis_i2c_driver;
 static int iic_tpm_read(u8 addr, u8 *buffer, size_t len)
 {
 
-	struct i2c_msg msg1 = { tpm_dev.client->addr, 0, 1, &addr };
-	struct i2c_msg msg2 = { tpm_dev.client->addr, I2C_M_RD, len, buffer };
+	struct i2c_msg msg1 = {
+		.addr = tpm_dev.client->addr,
+		.flags = 0,
+		.len = 1,
+		.buf = &addr
+	};
+	struct i2c_msg msg2 = {
+		.addr = tpm_dev.client->addr,
+		.flags = I2C_M_RD,
+		.len = len,
+		.buf = buffer
+	};
 
 	int rc;
 	int count;
@@ -138,7 +148,12 @@ static int iic_tpm_write_generic(u8 addr, u8 *buffer, size_t len,
 	int rc = -EIO;
 	int count;
 
-	struct i2c_msg msg1 = { tpm_dev.client->addr, 0, len + 1, tpm_dev.buf };
+	struct i2c_msg msg1 = {
+			.addr = tpm_dev.client->addr,
+			.flags = 0,
+			.len = len + 1,
+			.buf = tpm_dev.buf
+	};
 
 	if (len > TPM_BUFSIZE)
 		return -EINVAL;
-- 
1.7.5.4

RE: [tpmdd-devel] [PATCH] char/tpm: Convert struct i2c_msg initialization to C99 format

[Peter.Huewe-d0qZbvYSIPpWk0Htik3J/w]

> Convert the struct i2c_msg initialization to C99 format. This makes
> maintaining and editing the code simpler. Also helps once other fields
> like transferred are added in future.

> Thanks to Julia Lawall <julia.lawall-L2FTfq7BK8M@public.gmane.org>  for automating the conversion

Looks good to me,
Reviewed-by: Peter Huewe <peter.huewe-d0qZbvYSIPpWk0Htik3J/w@public.gmane.org>

BUT maybe we should probably wait for the outcome of the 
"introduce macros for i2c_msg initialization" discussion also by Julia:
https://lkml.org/lkml/2012/10/7/92
which would wrap this initialization into a macro:

struct i2c_msg msg1 = I2C_MSG_WRITE(tpm_dev.client->addr, 1, &addr);
struct i2c_msg msg2 I2C_MSG_READ(tpm_dev.client->addr, len, buffer);
...
struct i2c_msg msg1 = I2C_MSG_WRITE(tpm_dev.client->addr, len + 1, tpm_dev.buf);

When the discussion is settled I'd probably go directly to I2C_MSG_ macros in order to avoid a double conversion.

Thanks,
Peter

Re: [tpmdd-devel] [PATCH] char/tpm: Convert struct i2c_msg initialization to C99 format

[Jean Delvare]

On Tue, 9 Oct 2012 16:07:18 +0000, Peter.Huewe-d0qZbvYSIPpWk0Htik3J/w@public.gmane.org wrote:
> > Convert the struct i2c_msg initialization to C99 format. This makes
> > maintaining and editing the code simpler. Also helps once other fields
> > like transferred are added in future.
> 
> > Thanks to Julia Lawall <julia.lawall-L2FTfq7BK8M@public.gmane.org>  for automating the conversion
> 
> Looks good to me,
> Reviewed-by: Peter Huewe <peter.huewe-d0qZbvYSIPpWk0Htik3J/w@public.gmane.org>
> 
> BUT maybe we should probably wait for the outcome of the 
> "introduce macros for i2c_msg initialization" discussion also by Julia:
> https://lkml.org/lkml/2012/10/7/92
> which would wrap this initialization into a macro:
> 
> struct i2c_msg msg1 = I2C_MSG_WRITE(tpm_dev.client->addr, 1, &addr);
> struct i2c_msg msg2 I2C_MSG_READ(tpm_dev.client->addr, len, buffer);
> ...
> struct i2c_msg msg1 = I2C_MSG_WRITE(tpm_dev.client->addr, len + 1, tpm_dev.buf);
> 
> When the discussion is settled I'd probably go directly to I2C_MSG_ macros in order to avoid a double conversion.

I thought about it, but actually I'd rather pick Shubhrajyoti's patches
first. We don't know where Julia's patch will be going at this point,
and other patches depend on the patches Shubhrajyoti sent, which I do
not want to delay. Julia's changes, if applied, will touch over 200
drivers anyway, so 4 more or less don't make any difference. I also
suspect that Julia's scripts won't catch the non-C99 initializations,
so she probably won't see them Shubhrajyoti's patches are applied -
that's one more reason to apply them immediately.

-- 
Jean Delvare

RE: [tpmdd-devel] [PATCH] char/tpm: Convert struct i2c_msg initialization to C99 format

[Peter.Huewe-d0qZbvYSIPpWk0Htik3J/w]

Hi Jean,

>> When the discussion is settled I'd probably go directly to I2C_MSG_ macros in order to avoid a double conversion.

> I thought about it, but actually I'd rather pick Shubhrajyoti's patches
> first. We don't know where Julia's patch will be going at this point,
> and other patches depend on the patches Shubhrajyoti sent, which I do
> not want to delay. Julia's changes, if applied, will touch over 200
> drivers anyway, so 4 more or less don't make any difference. I also
> suspect that Julia's scripts won't catch the non-C99 initializations,
> so she probably won't see them Shubhrajyoti's patches are applied -
> that's one more reason to apply them immediately.

Thanks for your input, I just read also your reply to Julia's patchset - so I'm fine with the patch.

> so she probably won't see them Shubhrajyoti's patches are applied...
Hehe, I tend to look at the i2c subsystem from time to time to catch-up with the new features (e.g. __i2c_transfer for this driver)
and apply them to stuff I'm aware of ;) - but of course you're right.


Reviewed-by: Peter Huewe <peter.huewe-d0qZbvYSIPpWk0Htik3J/w@public.gmane.org>
And as the driver's author:
Acked-by: Peter Huewe <peter.huewe-d0qZbvYSIPpWk0Htik3J/w@public.gmane.org>



Thanks,
Peter

Re: [PATCH] char/tpm: Convert struct i2c_msg initialization to C99 format

[Jean Delvare]

On Tue, 9 Oct 2012 17:12:31 +0530, Shubhrajyoti D wrote:
> Convert the struct i2c_msg initialization to C99 format. This makes
> maintaining and editing the code simpler. Also helps once other fields
> like transferred are added in future.
> 
> Thanks to Julia Lawall <julia.lawall-L2FTfq7BK8M@public.gmane.org>  for automating the conversion
> 
> Signed-off-by: Shubhrajyoti D <shubhrajyoti-l0cyMroinI0@public.gmane.org>
> ---
>  drivers/char/tpm/tpm_i2c_infineon.c |   21 ++++++++++++++++++---
>  1 files changed, 18 insertions(+), 3 deletions(-)
> 
> diff --git a/drivers/char/tpm/tpm_i2c_infineon.c b/drivers/char/tpm/tpm_i2c_infineon.c
> index 5a831ae..01b07c7 100644
> --- a/drivers/char/tpm/tpm_i2c_infineon.c
> +++ b/drivers/char/tpm/tpm_i2c_infineon.c
> @@ -90,8 +90,18 @@ static struct i2c_driver tpm_tis_i2c_driver;
>  static int iic_tpm_read(u8 addr, u8 *buffer, size_t len)
>  {
>  
> -	struct i2c_msg msg1 = { tpm_dev.client->addr, 0, 1, &addr };
> -	struct i2c_msg msg2 = { tpm_dev.client->addr, I2C_M_RD, len, buffer };
> +	struct i2c_msg msg1 = {
> +		.addr = tpm_dev.client->addr,
> +		.flags = 0,

As said before, you can omit zero fields.

> +		.len = 1,
> +		.buf = &addr
> +	};
> +	struct i2c_msg msg2 = {
> +		.addr = tpm_dev.client->addr,
> +		.flags = I2C_M_RD,
> +		.len = len,
> +		.buf = buffer
> +	};
>  
>  	int rc;
>  	int count;
> @@ -138,7 +148,12 @@ static int iic_tpm_write_generic(u8 addr, u8 *buffer, size_t len,
>  	int rc = -EIO;
>  	int count;
>  
> -	struct i2c_msg msg1 = { tpm_dev.client->addr, 0, len + 1, tpm_dev.buf };
> +	struct i2c_msg msg1 = {
> +			.addr = tpm_dev.client->addr,
> +			.flags = 0,
> +			.len = len + 1,
> +			.buf = tpm_dev.buf
> +	};
>  
>  	if (len > TPM_BUFSIZE)
>  		return -EINVAL;

Acked-by: Jean Delvare <khali-PUYAD+kWke1g9hUCZPvPmw@public.gmane.org>

-- 
Jean Delvare

Re: [PATCH] char/tpm: Convert struct i2c_msg initialization to C99 format

[Shubhrajyoti Datta]

On Wed, Oct 10, 2012 at 2:36 PM, Jean Delvare <khali-PUYAD+kWke1g9hUCZPvPmw@public.gmane.org> wrote:
> On Tue, 9 Oct 2012 17:12:31 +0530, Shubhrajyoti D wrote:
Thanks for review updated patch below
>From f3786807bbaafe1f0dfcf2d94e3bee1c273296a4 Mon Sep 17 00:00:00 2001
From: Shubhrajyoti D <shubhrajyoti-l0cyMroinI0@public.gmane.org>
Date: Mon, 17 Sep 2012 19:34:37 +0530
Subject: [PATCHv2] char/tpm: Convert struct i2c_msg initialization to C99
 format

Convert the struct i2c_msg initialization to C99 format. This makes
maintaining and editing the code simpler. Also helps once other fields
like transferred are added in future.

Thanks to Julia Lawall <julia.lawall-L2FTfq7BK8M@public.gmane.org>  for automating the conversion

Acked-by: Jean Delvare <khali-PUYAD+kWke1g9hUCZPvPmw@public.gmane.org>
Signed-off-by: Shubhrajyoti D <shubhrajyoti-l0cyMroinI0@public.gmane.org>
---
v2: removed zero initialisation of flags.

 drivers/char/tpm/tpm_i2c_infineon.c |   19 ++++++++++++++++---
 1 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/drivers/char/tpm/tpm_i2c_infineon.c
b/drivers/char/tpm/tpm_i2c_infineon.c
index 5a831ae..cbf72e1 100644
--- a/drivers/char/tpm/tpm_i2c_infineon.c
+++ b/drivers/char/tpm/tpm_i2c_infineon.c
@@ -90,8 +90,17 @@ static struct i2c_driver tpm_tis_i2c_driver;
 static int iic_tpm_read(u8 addr, u8 *buffer, size_t len)
 {

-	struct i2c_msg msg1 = { tpm_dev.client->addr, 0, 1, &addr };
-	struct i2c_msg msg2 = { tpm_dev.client->addr, I2C_M_RD, len, buffer };
+	struct i2c_msg msg1 = {
+		.addr = tpm_dev.client->addr,
+		.len = 1,
+		.buf = &addr
+	};
+	struct i2c_msg msg2 = {
+		.addr = tpm_dev.client->addr,
+		.flags = I2C_M_RD,
+		.len = len,
+		.buf = buffer
+	};

 	int rc;
 	int count;
@@ -138,7 +147,11 @@ static int iic_tpm_write_generic(u8 addr, u8
*buffer, size_t len,
 	int rc = -EIO;
 	int count;

-	struct i2c_msg msg1 = { tpm_dev.client->addr, 0, len + 1, tpm_dev.buf };
+	struct i2c_msg msg1 = {
+			.addr = tpm_dev.client->addr,
+			.len = len + 1,
+			.buf = tpm_dev.buf
+	};

 	if (len > TPM_BUFSIZE)
 		return -EINVAL;
-- 
1.7.5.4

RE: [tpmdd-devel] [PATCH] char/tpm: Convert struct i2c_msg initialization to C99 format

[Peter.Huewe-d0qZbvYSIPpWk0Htik3J/w]

> -----Original Message-----
> From: Shubhrajyoti Datta [mailto:omaplinuxkernel-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org] 
> Subject: [PATCHv2] char/tpm: Convert struct i2c_msg initialization to C99 format

> Convert the struct i2c_msg initialization to C99 format. This makes
> maintaining and editing the code simpler. Also helps once other fields
> like transferred are added in future.

> Thanks to Julia Lawall <julia.lawall-L2FTfq7BK8M@public.gmane.org>  for automating the conversion

> Acked-by: Jean Delvare <khali-PUYAD+kWke1g9hUCZPvPmw@public.gmane.org>
> Signed-off-by: Shubhrajyoti D <shubhrajyoti-l0cyMroinI0@public.gmane.org>

Acked-by: Peter Huewe <peter.huewe-d0qZbvYSIPpWk0Htik3J/w@public.gmane.org>

RE: [tpmdd-devel] [PATCH] char/tpm: Convert struct i2c_msg initialization to C99 format

[Peter.Huewe-d0qZbvYSIPpWk0Htik3J/w]

-----Original Message-----
From: Huewe Peter (IFAG CCS TI SWT SW ESW) 
Sent: Wednesday, October 10, 2012 4:15 PM
To: 'Shubhrajyoti Datta'; Jean Delvare
Cc: tpmdd-iBygD9l97zzQT0dZR+AlfA@public.gmane.org; mail-ZlhrYzitvtWsTnJN9+BGXg@public.gmane.org; tpmdd-devel-5NWGOfrQmneRv+LV9MX5uipxlwaOVQ5f@public.gmane.org; linux-i2c-u79uwXL29TY76Z2rM5mHXA@public.gmane.org; key-23VcF4HTsmIX0ybBhKVfKdBPR1lH4CV8@public.gmane.org; Shubhrajyoti D
Subject: RE: [tpmdd-devel] [PATCH] char/tpm: Convert struct i2c_msg initialization to C99 format

> -----Original Message-----
> From: Shubhrajyoti Datta [mailto:omaplinuxkernel-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org]
> Subject: [PATCHv2] char/tpm: Convert struct i2c_msg initialization to 
> C99 format

> Convert the struct i2c_msg initialization to C99 format. This makes 
> maintaining and editing the code simpler. Also helps once other fields 
> like transferred are added in future.

> Thanks to Julia Lawall <julia.lawall-L2FTfq7BK8M@public.gmane.org>  for automating the 
> conversion

> Acked-by: Jean Delvare <khali-PUYAD+kWke1g9hUCZPvPmw@public.gmane.org>
> Signed-off-by: Shubhrajyoti D <shubhrajyoti-l0cyMroinI0@public.gmane.org>

> Acked-by: Peter Huewe <peter.huewe-d0qZbvYSIPpWk0Htik3J/w@public.gmane.org>


Hi,

was this applied somewhere? 


Thanks,
Peter

Re: [tpmdd-devel] [PATCH] char/tpm: Convert struct i2c_msg initialization to C99 format

[Jean Delvare]

On Mon, 10 Dec 2012 16:54:08 +0000, Peter.Huewe-d0qZbvYSIPpWk0Htik3J/w@public.gmane.org wrote:
> -----Original Message-----
> From: Huewe Peter (IFAG CCS TI SWT SW ESW) 
> Sent: Wednesday, October 10, 2012 4:15 PM
> To: 'Shubhrajyoti Datta'; Jean Delvare
> Cc: tpmdd-iBygD9l97zzQT0dZR+AlfA@public.gmane.org; mail-ZlhrYzitvtWsTnJN9+BGXg@public.gmane.org; tpmdd-devel-5NWGOfrQmneRv+LV9MX5uipxlwaOVQ5f@public.gmane.org; linux-i2c-u79uwXL29TY76Z2rM5mHXA@public.gmane.org; key-23VcF4HTsmIX0ybBhKVfKdBPR1lH4CV8@public.gmane.org; Shubhrajyoti D
> Subject: RE: [tpmdd-devel] [PATCH] char/tpm: Convert struct i2c_msg initialization to C99 format
> 
> > -----Original Message-----
> > From: Shubhrajyoti Datta [mailto:omaplinuxkernel-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org]
> > Subject: [PATCHv2] char/tpm: Convert struct i2c_msg initialization to 
> > C99 format
> 
> > Convert the struct i2c_msg initialization to C99 format. This makes 
> > maintaining and editing the code simpler. Also helps once other fields 
> > like transferred are added in future.
> 
> > Thanks to Julia Lawall <julia.lawall-L2FTfq7BK8M@public.gmane.org>  for automating the 
> > conversion
> 
> > Acked-by: Jean Delvare <khali-PUYAD+kWke1g9hUCZPvPmw@public.gmane.org>
> > Signed-off-by: Shubhrajyoti D <shubhrajyoti-l0cyMroinI0@public.gmane.org>
> 
> > Acked-by: Peter Huewe <peter.huewe-d0qZbvYSIPpWk0Htik3J/w@public.gmane.org>
> 
> 
> Hi,
> 
> was this applied somewhere? 

Not that I am aware of. Would be a good idea to resend it with Cc to
Andrew so that it doesn't get lost.

-- 
Jean Delvare