lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[PATCH] I2C: max6875 code cleanup

Browse Source 
Remove an unused local variable and change the subclient name.

Signed-off-by: Ben Gardner <bgardner@wabtec.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
bgardner@wabtec.com
2005-07-27 12:43:14 -05:00
committed by Greg Kroah-Hartman
parent 0283fe6c3b
commit 17f990c87a
1 changed files with 2 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/i2c/chips/max6875.c
View File

@@ -81,7 +81,6 @@ static void max6875_update_slice(struct i2c_client *client, int slice)
struct max6875_data *data = i2c_get_clientdata(client); struct max6875_data *data = i2c_get_clientdata(client);
int i, j, addr; int i, j, addr;
u8 *buf; u8 *buf;
int retval = 0;
if (slice >= USER_EEPROM_SLICES) if (slice >= USER_EEPROM_SLICES)
return; return;
@@ -102,7 +101,6 @@ static void max6875_update_slice(struct i2c_client *client, int slice)
/* select the eeprom address */ /* select the eeprom address */
if (i2c_smbus_write_byte_data(client, addr >> 8, addr & 0xFF)) { if (i2c_smbus_write_byte_data(client, addr >> 8, addr & 0xFF)) {
dev_err(&client->dev, "address set failed\n"); dev_err(&client->dev, "address set failed\n");
retval = -1;
goto exit_up; goto exit_up;
} }
@@ -111,14 +109,12 @@ static void max6875_update_slice(struct i2c_client *client, int slice)
if (i2c_smbus_read_i2c_block_data(client, if (i2c_smbus_read_i2c_block_data(client,
MAX6875_CMD_BLK_READ, MAX6875_CMD_BLK_READ,
buf) != SLICE_SIZE) { buf) != SLICE_SIZE) {
retval = -1;
goto exit_up; goto exit_up;
} }
} else { } else {
for (i = 0; i < SLICE_SIZE; i++) { for (i = 0; i < SLICE_SIZE; i++) {
j = i2c_smbus_read_byte(client); j = i2c_smbus_read_byte(client);
if (j < 0) { if (j < 0) {
retval = -1;
goto exit_up; goto exit_up;
} }
buf[i] = j; buf[i] = j;
@@ -182,7 +178,7 @@ static int max6875_detect(struct i2c_adapter *adapter, int address, int kind)
i2c_smbus_xfer(adapter, address, 0, 0, 0, i2c_smbus_xfer(adapter, address, 0, 0, 0,
I2C_SMBUS_QUICK, NULL); I2C_SMBUS_QUICK, NULL);
if (!i2c_check_functionality(adapter, I2C_FUNC_SMBUS_BYTE_DATA if (!i2c_check_functionality(adapter, I2C_FUNC_SMBUS_WRITE_BYTE_DATA
| I2C_FUNC_SMBUS_READ_BYTE)) | I2C_FUNC_SMBUS_READ_BYTE))
return 0; return 0;
@@ -218,7 +214,7 @@ static int max6875_detect(struct i2c_adapter *adapter, int address, int kind)
fake_client->adapter = adapter; fake_client->adapter = adapter;
fake_client->driver = &max6875_driver; fake_client->driver = &max6875_driver;
fake_client->flags = 0; fake_client->flags = 0;
strlcpy(fake_client->name, "max6875-dummy", I2C_NAME_SIZE); strlcpy(fake_client->name, "max6875 subclient", I2C_NAME_SIZE);
/* Prevent 24RF08 corruption (in case of user error) */ /* Prevent 24RF08 corruption (in case of user error) */
i2c_smbus_write_quick(real_client, 0); i2c_smbus_write_quick(real_client, 0);