wt/lm-sensors
1
0 Fork 0
mirror of https://github.com/lm-sensors/lm-sensors.git synced 2026-10-25 12:14:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove dead code. Backport from a 2.6 kernel patch by

Browse Source 
Hans-Frieder Vogt.


git-svn-id: http://lm-sensors.org/svn/lm-sensors/trunk@3072 7894878c-1315-0410-8ee3-d5d059ff63e0
This commit is contained in:
Jean Delvare committed 2005-09-07 20:16:18 +00:00
1 parent 222cfb6918
commit 08bdbcac71
1 file changed
+4 -32
Download Patch File Download Diff File Expand all files Collapse all files
kernel/busses/i2c-nforce2.c
+4 -32
View File
@@ -119,11 +119,6 @@ struct nforce2_smbus {
#define NVIDIA_SMB_PRTCL_PEC 0x80
/* Other settings */
#define MAX_TIMEOUT 256
static s32 nforce2_access(struct i2c_adapter *adap, u16 addr,
unsigned short flags, char read_write,
u8 command, int size, union i2c_smbus_data *data);
@@ -149,7 +144,6 @@ s32 nforce2_access(struct i2c_adapter * adap, u16 addr, unsigned short flags,
struct nforce2_smbus *smbus = adap->algo_data;
unsigned char protocol, pec, temp;
unsigned char len = 0; /* to keep the compiler quiet */
int timeout = 0;
int i;
protocol = (read_write == I2C_SMBUS_READ) ? NVIDIA_SMB_PRTCL_READ : NVIDIA_SMB_PRTCL_WRITE;
@@ -208,29 +202,10 @@ s32 nforce2_access(struct i2c_adapter * adap, u16 addr, unsigned short flags,
case I2C_SMBUS_PROC_CALL:
printk(KERN_WARNING "i2c-nforce2.o: I2C_SMBUS_PROC_CALL not supported!\n");
return -1;
/*
outb_p(command, NVIDIA_SMB_CMD);
outb_p(data->word, NVIDIA_SMB_DATA);
outb_p(data->word >> 8, NVIDIA_SMB_DATA + 1);
protocol = NVIDIA_SMB_PRTCL_PROC_CALL | pec;
read_write = I2C_SMBUS_READ;
break;
*/
case I2C_SMBUS_BLOCK_PROC_CALL:
printk(KERN_WARNING "i2c-nforce2.o: I2C_SMBUS_BLOCK_PROC_CALL not supported!\n");
return -1;
/*
protocol |= pec;
len = min_t(u8, data->block[0], 31);
outb_p(command, NVIDIA_SMB_CMD);
outb_p(len, NVIDIA_SMB_BCNT);
for (i = 0; i < len; i++)
outb_p(data->block[i + 1], NVIDIA_SMB_DATA + i);
protocol = NVIDIA_SMB_PRTCL_BLOCK_PROC_CALL | pec;
read_write = I2C_SMBUS_READ;
break;
*/
case I2C_SMBUS_WORD_DATA_PEC:
case I2C_SMBUS_BLOCK_DATA_PEC:
@@ -249,12 +224,6 @@ s32 nforce2_access(struct i2c_adapter * adap, u16 addr, unsigned short flags,
temp = inb_p(NVIDIA_SMB_STS);
#if 0
do {
i2c_delay(1);
temp = inb_p(NVIDIA_SMB_STS);
} while (((temp & NVIDIA_SMB_STS_DONE) == 0) && (timeout++ < MAX_TIMEOUT));
#endif
if (~temp & NVIDIA_SMB_STS_DONE) {
udelay(500);
temp = inb_p(NVIDIA_SMB_STS);
@@ -264,8 +233,11 @@ s32 nforce2_access(struct i2c_adapter * adap, u16 addr, unsigned short flags,
temp = inb_p(NVIDIA_SMB_STS);
}
if ((timeout >= MAX_TIMEOUT) || (~temp & NVIDIA_SMB_STS_DONE) || (temp & NVIDIA_SMB_STS_STATUS))
if ((~temp & NVIDIA_SMB_STS_DONE) || (temp & NVIDIA_SMB_STS_STATUS)) {
printk(KERN_DEBUG "i2c-nforce2.o: SMBus Timeout! (0x%02x)\n",
temp);
return -1;
}
if (read_write == I2C_SMBUS_WRITE)
return 0;