diff mbox

[v3,1/1] i2c: core: replace boolean variable by integer

Message ID 1447949516-107966-1-git-send-email-andriy.shevchenko@linux.intel.com
State Superseded
Headers show

Commit Message

Andy Shevchenko Nov. 19, 2015, 4:11 p.m. UTC
There is a warning when compiling i2c-core.c
drivers/i2c/i2c-core.c:2561:36: warning: dubious: x | !y

Replace boolean exdpression by a plain bitwise AND since I2C_M_RD is a bit 0
and thus we are on the safe side.

Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Reviewed-by: Alexander Sverdlin <aleaxander.sverdlin@nokia.com>
---
Changelog v3:
- add tag
- rephrase commit message
 drivers/i2c/i2c-core.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Andy Shevchenko Jan. 25, 2016, 8:55 a.m. UTC | #1
On Thu, 2015-11-19 at 18:11 +0200, Andy Shevchenko wrote:
> There is a warning when compiling i2c-core.c
> drivers/i2c/i2c-core.c:2561:36: warning: dubious: x | !y
> 
> Replace boolean exdpression by a plain bitwise AND since I2C_M_RD is
> a bit 0
> and thus we are on the safe side.

Wolfram, any news about this change? Last time I remember you talked
about your series which makes this change obsolete.

> 
> Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
> Reviewed-by: Alexander Sverdlin <aleaxander.sverdlin@nokia.com>
> ---
> Changelog v3:
> - add tag
> - rephrase commit message
>  drivers/i2c/i2c-core.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/drivers/i2c/i2c-core.c b/drivers/i2c/i2c-core.c
> index 040af5c..873ca1c 100644
> --- a/drivers/i2c/i2c-core.c
> +++ b/drivers/i2c/i2c-core.c
> @@ -2591,7 +2591,7 @@ static u8 i2c_smbus_pec(u8 crc, u8 *p, size_t
> count)
>  static u8 i2c_smbus_msg_pec(u8 pec, struct i2c_msg *msg)
>  {
>  	/* The address will be sent first */
> -	u8 addr = (msg->addr << 1) | !!(msg->flags & I2C_M_RD);
> +	u8 addr = (msg->addr << 1) | (msg->flags & I2C_M_RD);
>  	pec = i2c_smbus_pec(pec, &addr, 1);
>  
>  	/* The data buffer follows */
Wolfram Sang Jan. 26, 2016, 6:04 a.m. UTC | #2
On Mon, Jan 25, 2016 at 10:55:44AM +0200, Andy Shevchenko wrote:
> On Thu, 2015-11-19 at 18:11 +0200, Andy Shevchenko wrote:
> > There is a warning when compiling i2c-core.c
> > drivers/i2c/i2c-core.c:2561:36: warning: dubious: x | !y
> > 
> > Replace boolean exdpression by a plain bitwise AND since I2C_M_RD is
> > a bit 0
> > and thus we are on the safe side.
> 
> Wolfram, any news about this change? Last time I remember you talked
> about your series which makes this change obsolete.

-EBUSY :/

I hope to tackle it on the train to FOSDEM later this week...
Uwe Kleine-König Jan. 26, 2016, 8:56 a.m. UTC | #3
Hello,

On Thu, Nov 19, 2015 at 06:11:56PM +0200, Andy Shevchenko wrote:
> There is a warning when compiling i2c-core.c
> drivers/i2c/i2c-core.c:2561:36: warning: dubious: x | !y
> 
> Replace boolean exdpression by a plain bitwise AND since I2C_M_RD is a bit 0

s/exdpression/expression/

Best regards
Uwe
diff mbox

Patch

diff --git a/drivers/i2c/i2c-core.c b/drivers/i2c/i2c-core.c
index 040af5c..873ca1c 100644
--- a/drivers/i2c/i2c-core.c
+++ b/drivers/i2c/i2c-core.c
@@ -2591,7 +2591,7 @@  static u8 i2c_smbus_pec(u8 crc, u8 *p, size_t count)
 static u8 i2c_smbus_msg_pec(u8 pec, struct i2c_msg *msg)
 {
 	/* The address will be sent first */
-	u8 addr = (msg->addr << 1) | !!(msg->flags & I2C_M_RD);
+	u8 addr = (msg->addr << 1) | (msg->flags & I2C_M_RD);
 	pec = i2c_smbus_pec(pec, &addr, 1);
 
 	/* The data buffer follows */