tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

i2c: rtl9300: Drop unsupported I2C_FUNC_SMBUS_I2C_BLOCK

While applying the patch for commit ede965fd555a ("i2c: rtl9300: remove
broken SMBus Quick operation support"), a conflict was incorrectly solved
by adding the I2C_FUNC_SMBUS_I2C_BLOCK feature flag. But the code to handle
I2C_SMBUS_I2C_BLOCK_DATA requests will be added by a separate commit.

Fixes: ede965fd555a ("i2c: rtl9300: remove broken SMBus Quick operation support")
Signed-off-by: Sven Eckelmann <sven@narfation.org>
Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com>

authored by Sven Eckelmann and committed by Wolfram Sang 09553051 ed45b7a4

options
unified split
Changed files
+1 -2
drivers
i2c
busses
i2c-rtl9300.c
+1 -2
drivers/i2c/busses/i2c-rtl9300.c
··· 307 307 static u32 rtl9300_i2c_func(struct i2c_adapter *a) 308 308 { 309 309 return I2C_FUNC_SMBUS_BYTE | I2C_FUNC_SMBUS_BYTE_DATA | 310 - I2C_FUNC_SMBUS_WORD_DATA | I2C_FUNC_SMBUS_BLOCK_DATA | 311 - I2C_FUNC_SMBUS_I2C_BLOCK; 310 + I2C_FUNC_SMBUS_WORD_DATA | I2C_FUNC_SMBUS_BLOCK_DATA; 312 311 } 313 312 314 313 static const struct i2c_algorithm rtl9300_i2c_algo = {