| Message ID | 1460401049-25459-2-git-send-email-bgolaszewski@baylibre.com |
|---|---|
| State | Accepted |
| Headers | show |
On Mon, Apr 11, 2016 at 11:57:17AM -0700, Bartosz Golaszewski wrote: > It seems as if the second check for I2C_FUNC_I2C functionality had > been introduced accidentally during a merge. Tt's reduntant, so > remove it. > > Signed-off-by: Bartosz Golaszewski <bgolaszewski@baylibre.com> Reworded commit message (there was no merge conflict) and applied to for-next, thanks!
diff --git a/drivers/misc/eeprom/at24.c b/drivers/misc/eeprom/at24.c index 089d694..001a9af 100644 --- a/drivers/misc/eeprom/at24.c +++ b/drivers/misc/eeprom/at24.c @@ -544,10 +544,7 @@ static int at24_probe(struct i2c_client *client, const struct i2c_device_id *id) } else { return -EPFNOSUPPORT; } - } - /* Use I2C operations unless we're stuck with SMBus extensions. */ - if (!i2c_check_functionality(client->adapter, I2C_FUNC_I2C)) { if (i2c_check_functionality(client->adapter, I2C_FUNC_SMBUS_WRITE_I2C_BLOCK)) { use_smbus_write = I2C_SMBUS_I2C_BLOCK_DATA;
It seems as if the second check for I2C_FUNC_I2C functionality had been introduced accidentally during a merge. Tt's reduntant, so remove it. Signed-off-by: Bartosz Golaszewski <bgolaszewski@baylibre.com> --- drivers/misc/eeprom/at24.c | 3 --- 1 file changed, 3 deletions(-)