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

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

[PATCH] i2c: SMBus PEC support rewrite, 1 of 3 



Discard I2C_FUNC_SMBUS_*_PEC defines. i2c clients are not supposed to
check for PEC support of i2c bus drivers on individual SMBus
transactions, and i2c bus drivers are not supposed to advertise them.

Signed-off-by: default avatarJean Delvare <khali@linux-fr.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 142078f6

drivers/i2c/busses/i2c-i801.c

+1 −2
Original line number Diff line number Diff line
@@ -513,8 +513,7 @@ static u32 i801_func(struct i2c_adapter *adapter) 
	return I2C_FUNC_SMBUS_QUICK | I2C_FUNC_SMBUS_BYTE |

	    I2C_FUNC_SMBUS_BYTE_DATA | I2C_FUNC_SMBUS_WORD_DATA |

	    I2C_FUNC_SMBUS_BLOCK_DATA | I2C_FUNC_SMBUS_WRITE_I2C_BLOCK

	     | (isich4 ? I2C_FUNC_SMBUS_BLOCK_DATA_PEC |

	                 I2C_FUNC_SMBUS_HWPEC_CALC : 0);

	     | (isich4 ? I2C_FUNC_SMBUS_HWPEC_CALC : 0);

}



static struct i2c_algorithm smbus_algorithm = {

include/linux/i2c.h

+0 −18
Original line number Diff line number Diff line
@@ -389,10 +389,6 @@ struct i2c_msg { 
#define I2C_FUNC_10BIT_ADDR		0x00000002

#define I2C_FUNC_PROTOCOL_MANGLING	0x00000004 /* I2C_M_{REV_DIR_ADDR,NOSTART,..} */

#define I2C_FUNC_SMBUS_HWPEC_CALC	0x00000008 /* SMBus 2.0 */

#define I2C_FUNC_SMBUS_READ_WORD_DATA_PEC  0x00000800 /* SMBus 2.0 */ 

#define I2C_FUNC_SMBUS_WRITE_WORD_DATA_PEC 0x00001000 /* SMBus 2.0 */ 

#define I2C_FUNC_SMBUS_PROC_CALL_PEC	0x00002000 /* SMBus 2.0 */

#define I2C_FUNC_SMBUS_BLOCK_PROC_CALL_PEC 0x00004000 /* SMBus 2.0 */

#define I2C_FUNC_SMBUS_BLOCK_PROC_CALL	0x00008000 /* SMBus 2.0 */

#define I2C_FUNC_SMBUS_QUICK		0x00010000 

#define I2C_FUNC_SMBUS_READ_BYTE	0x00020000
@@ -408,8 +404,6 @@ struct i2c_msg { 
#define I2C_FUNC_SMBUS_WRITE_I2C_BLOCK	0x08000000 /* w/ 1-byte reg. addr. */

#define I2C_FUNC_SMBUS_READ_I2C_BLOCK_2	 0x10000000 /* I2C-like block xfer  */

#define I2C_FUNC_SMBUS_WRITE_I2C_BLOCK_2 0x20000000 /* w/ 2-byte reg. addr. */

#define I2C_FUNC_SMBUS_READ_BLOCK_DATA_PEC  0x40000000 /* SMBus 2.0 */

#define I2C_FUNC_SMBUS_WRITE_BLOCK_DATA_PEC 0x80000000 /* SMBus 2.0 */



#define I2C_FUNC_SMBUS_BYTE (I2C_FUNC_SMBUS_READ_BYTE | \

                             I2C_FUNC_SMBUS_WRITE_BYTE)
@@ -423,17 +417,6 @@ struct i2c_msg { 
                                  I2C_FUNC_SMBUS_WRITE_I2C_BLOCK)

#define I2C_FUNC_SMBUS_I2C_BLOCK_2 (I2C_FUNC_SMBUS_READ_I2C_BLOCK_2 | \

                                    I2C_FUNC_SMBUS_WRITE_I2C_BLOCK_2)

#define I2C_FUNC_SMBUS_BLOCK_DATA_PEC (I2C_FUNC_SMBUS_READ_BLOCK_DATA_PEC | \

                                       I2C_FUNC_SMBUS_WRITE_BLOCK_DATA_PEC)

#define I2C_FUNC_SMBUS_WORD_DATA_PEC  (I2C_FUNC_SMBUS_READ_WORD_DATA_PEC | \

                                       I2C_FUNC_SMBUS_WRITE_WORD_DATA_PEC)



#define I2C_FUNC_SMBUS_READ_BYTE_PEC		I2C_FUNC_SMBUS_READ_BYTE_DATA

#define I2C_FUNC_SMBUS_WRITE_BYTE_PEC		I2C_FUNC_SMBUS_WRITE_BYTE_DATA

#define I2C_FUNC_SMBUS_READ_BYTE_DATA_PEC	I2C_FUNC_SMBUS_READ_WORD_DATA

#define I2C_FUNC_SMBUS_WRITE_BYTE_DATA_PEC	I2C_FUNC_SMBUS_WRITE_WORD_DATA

#define I2C_FUNC_SMBUS_BYTE_PEC			I2C_FUNC_SMBUS_BYTE_DATA

#define I2C_FUNC_SMBUS_BYTE_DATA_PEC		I2C_FUNC_SMBUS_WORD_DATA



#define I2C_FUNC_SMBUS_EMUL (I2C_FUNC_SMBUS_QUICK | \

                             I2C_FUNC_SMBUS_BYTE | \
@@ -441,7 +424,6 @@ struct i2c_msg { 
                             I2C_FUNC_SMBUS_WORD_DATA | \

                             I2C_FUNC_SMBUS_PROC_CALL | \

                             I2C_FUNC_SMBUS_WRITE_BLOCK_DATA | \

                             I2C_FUNC_SMBUS_WRITE_BLOCK_DATA_PEC | \

                             I2C_FUNC_SMBUS_I2C_BLOCK)



/*