[PATCH 03/03] i2c-i801: Fix minor style issues

[PATCH 03/03] i2c-i801: Fix minor style issues

[Ivo Manca]

[-- Attachment #1: Type: text/plain, Size: 197 bytes --]

This patch fixes minor style issues warned about by checkPatch

Signed-off-by: Ivo Manca <pinkel-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
---

[PATCH 00/03] i2c-i801: Add basic interrupt support



[-- Attachment #2: patch3.diff --]
[-- Type: text/plain, Size: 1354 bytes --]

--- __new	2008-07-23 10:51:28.000000000 +0200
+++ _new	2008-07-23 10:53:06.000000000 +0200
@@ -381,9 +381,8 @@ static int i801_block_transaction_byte_b
 		do {
 			msleep(1);
 			temp = inb_p(SMBHSTSTS);
-		}
-		while ((!(temp & SMBHSTSTS_BYTE_DONE))
-		       && (timeout++ < MAX_TIMEOUT));
+		} while ((!(temp & SMBHSTSTS_BYTE_DONE))
+			 && (timeout++ < MAX_TIMEOUT));
 
 		/* If the SMBus is still busy, we give up */
 		if (timeout >= MAX_TIMEOUT) {
@@ -502,7 +501,7 @@ static int i801_block_transaction(union 
 }
 
 /* Return -1 on error. */
-static s32 i801_access(struct i2c_adapter * adap, u16 addr,
+static s32 i801_access(struct i2c_adapter *adap, u16 addr,
 		       unsigned short flags, char read_write, u8 command,
 		       int size, union i2c_smbus_data * data)
 {
@@ -574,7 +573,7 @@ static s32 i801_access(struct i2c_adapte
 	else
 		outb_p(inb_p(SMBAUXCTL) & (~SMBAUXCTL_CRC), SMBAUXCTL);
 
-	if(block)
+	if (block)
 		ret = i801_block_transaction(data, read_write, size, hwpec);
 	else
 		ret = i801_transaction(xact | ENABLE_INT9);
@@ -586,9 +585,9 @@ static s32 i801_access(struct i2c_adapte
 		outb_p(inb_p(SMBAUXCTL) & ~(SMBAUXCTL_CRC | SMBAUXCTL_E32B),
 		       SMBAUXCTL);
 
-	if(block)
+	if (block)
 		return ret;
-	if(ret)
+	if (ret)
 		return -1;
 	if ((read_write == I2C_SMBUS_WRITE) || (xact == I801_QUICK))
 		return 0;

[-- Attachment #3: Type: text/plain, Size: 157 bytes --]

_______________________________________________
i2c mailing list
i2c-GZX6beZjE8VD60Wz+7aTrA@public.gmane.org
http://lists.lm-sensors.org/mailman/listinfo/i2c

Re: [PATCH 03/03] i2c-i801: Fix minor style issues

[Jean Delvare]

On Wed, 23 Jul 2008 18:57:37 +0200, Ivo Manca wrote:
> This patch fixes minor style issues warned about by checkPatch
> 
> Signed-off-by: Ivo Manca <pinkel-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
> ---
> 
> [PATCH 00/03] i2c-i801: Add basic interrupt support

> --- __new	2008-07-23 10:51:28.000000000 +0200
> +++ _new	2008-07-23 10:53:06.000000000 +0200
> @@ -381,9 +381,8 @@ static int i801_block_transaction_byte_b
>  		do {
>  			msleep(1);
>  			temp = inb_p(SMBHSTSTS);
> -		}
> -		while ((!(temp & SMBHSTSTS_BYTE_DONE))
> -		       && (timeout++ < MAX_TIMEOUT));
> +		} while ((!(temp & SMBHSTSTS_BYTE_DONE))
> +			 && (timeout++ < MAX_TIMEOUT));
>  
>  		/* If the SMBus is still busy, we give up */
>  		if (timeout >= MAX_TIMEOUT) {
> @@ -502,7 +501,7 @@ static int i801_block_transaction(union 
>  }
>  
>  /* Return -1 on error. */
> -static s32 i801_access(struct i2c_adapter * adap, u16 addr,
> +static s32 i801_access(struct i2c_adapter *adap, u16 addr,
>  		       unsigned short flags, char read_write, u8 command,
>  		       int size, union i2c_smbus_data * data)
>  {
> @@ -574,7 +573,7 @@ static s32 i801_access(struct i2c_adapte
>  	else
>  		outb_p(inb_p(SMBAUXCTL) & (~SMBAUXCTL_CRC), SMBAUXCTL);
>  
> -	if(block)
> +	if (block)
>  		ret = i801_block_transaction(data, read_write, size, hwpec);
>  	else
>  		ret = i801_transaction(xact | ENABLE_INT9);
> @@ -586,9 +585,9 @@ static s32 i801_access(struct i2c_adapte
>  		outb_p(inb_p(SMBAUXCTL) & ~(SMBAUXCTL_CRC | SMBAUXCTL_E32B),
>  		       SMBAUXCTL);
>  
> -	if(block)
> +	if (block)
>  		return ret;
> -	if(ret)
> +	if (ret)
>  		return -1;
>  	if ((read_write == I2C_SMBUS_WRITE) || (xact == I801_QUICK))
>  		return 0;

Looks OK, thanks for doing that.

I'm now waiting for an update of your patches based on 2.6.27-rc2 for a
final review.

Oh, one last note before I forget: as the interrupt-based logic is new
and might not be as robust as the old poll-based one, it might make
sense to give the user a way to disable the interrupt-based logic and
fall back to polling in case the new code doesn't work correctly.
Without that possibility, I won't feel too confident to push your
patches to Linus. Remember that the ICH chips are very popular and we
just can't afford breaking these systems.

This could be implemented as a build time option enabling the new
interrupt-based code, tagged EXPERIMENTAL and disabled by default, or a
module parameter, or both.

Thanks,
-- 
Jean Delvare

_______________________________________________
i2c mailing list
i2c-GZX6beZjE8VD60Wz+7aTrA@public.gmane.org
http://lists.lm-sensors.org/mailman/listinfo/i2c

Re: [PATCH 03/03] i2c-i801: Fix minor style issues

[Ivo Manca]

> Looks OK, thanks for doing that.
>   
Seemed to be the easiest and best way to shut checkpatch up ;)
> I'm now waiting for an update of your patches based on 2.6.27-rc2 for a
> final review.
>   
I hope to have them finnished and sent tomorrow.
> Oh, one last note before I forget: as the interrupt-based logic is new
> and might not be as robust as the old poll-based one, 
Likely
> it might make
> sense to give the user a way to disable the interrupt-based logic and
> fall back to polling in case the new code doesn't work correctly.
> Without that possibility, I won't feel too confident to push your
> patches to Linus. Remember that the ICH chips are very popular and we
> just can't afford breaking these systems.
>   
True, i'd rather have that option as well.
> This could be implemented as a build time option enabling the new
> interrupt-based code, tagged EXPERIMENTAL and disabled by default, or a
> module parameter, or both.
>   
What option do you think will generate more use and thus more testing? A 
build time option (which is disabled by default thus won't be used by 
the generic user) or a module parameter which people might not know the 
existance of, but is easy to enable? Not sure what the best option is :).

> Thanks,
>   
Ivo

_______________________________________________
i2c mailing list
i2c-GZX6beZjE8VD60Wz+7aTrA@public.gmane.org
http://lists.lm-sensors.org/mailman/listinfo/i2c

Re: [PATCH 03/03] i2c-i801: Fix minor style issues

[Jean Delvare]

On Tue, 12 Aug 2008 22:50:55 +0200, Ivo Manca wrote:
> > Oh, one last note before I forget: as the interrupt-based logic is new
> > and might not be as robust as the old poll-based one, 
> Likely
> > it might make
> > sense to give the user a way to disable the interrupt-based logic and
> > fall back to polling in case the new code doesn't work correctly.
> > Without that possibility, I won't feel too confident to push your
> > patches to Linus. Remember that the ICH chips are very popular and we
> > just can't afford breaking these systems.
> >   
> True, i'd rather have that option as well.
> > This could be implemented as a build time option enabling the new
> > interrupt-based code, tagged EXPERIMENTAL and disabled by default, or a
> > module parameter, or both.
> >   
> What option do you think will generate more use and thus more testing? A 
> build time option (which is disabled by default thus won't be used by 
> the generic user) or a module parameter which people might not know the 
> existance of, but is easy to enable? Not sure what the best option is :).

I think I would have a module parameter those default value is
determined by a configuration option. The default mode would be polling
first, then after some time we can change the default to interrupt
mode. And after some more time we remove the option. And maybe after
some more time (several years) we even remove the module parameter.

This seems like a reasonable upgrade path, which will let the users
help us with the testing on a voluntary basis while still not putting
the other users at risk.

-- 
Jean Delvare

_______________________________________________
i2c mailing list
i2c-GZX6beZjE8VD60Wz+7aTrA@public.gmane.org
http://lists.lm-sensors.org/mailman/listinfo/i2c