Commit 9b7b6d3b authored by Ben Gardner's avatar Ben Gardner Committed by Greg Kroah-Hartman

[PATCH] i2c: scx200_acb refactor/simplify code

scx200_acb: refactor/simplify code (no functional changes)
Signed-off-by: default avatarBen Gardner <bgardner@wabtec.com>
Signed-off-by: default avatarJean Delvare <khali@linux-fr.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent ef4d9275
...@@ -124,8 +124,17 @@ static void scx200_acb_machine(struct scx200_acb_iface *iface, u8 status) ...@@ -124,8 +124,17 @@ static void scx200_acb_machine(struct scx200_acb_iface *iface, u8 status)
errmsg = "not master"; errmsg = "not master";
goto error; goto error;
} }
if (status & ACBST_NEGACK) if (status & ACBST_NEGACK) {
goto negack; dev_dbg(&iface->adapter.dev, "negative ack in state %s\n",
scx200_acb_state_name[iface->state]);
iface->state = state_idle;
iface->result = -ENXIO;
outb(inb(ACBCTL1) | ACBCTL1_STOP, ACBCTL1);
outb(ACBST_STASTR | ACBST_NEGACK, ACBST);
return;
}
switch (iface->state) { switch (iface->state) {
case state_idle: case state_idle:
...@@ -202,17 +211,6 @@ static void scx200_acb_machine(struct scx200_acb_iface *iface, u8 status) ...@@ -202,17 +211,6 @@ static void scx200_acb_machine(struct scx200_acb_iface *iface, u8 status)
return; return;
negack:
dev_dbg(&iface->adapter.dev, "negative ack in state %s\n",
scx200_acb_state_name[iface->state]);
iface->state = state_idle;
iface->result = -ENXIO;
outb(inb(ACBCTL1) | ACBCTL1_STOP, ACBCTL1);
outb(ACBST_STASTR | ACBST_NEGACK, ACBST);
return;
error: error:
dev_err(&iface->adapter.dev, "%s in state %s\n", errmsg, dev_err(&iface->adapter.dev, "%s in state %s\n", errmsg,
scx200_acb_state_name[iface->state]); scx200_acb_state_name[iface->state]);
...@@ -222,20 +220,10 @@ static void scx200_acb_machine(struct scx200_acb_iface *iface, u8 status) ...@@ -222,20 +220,10 @@ static void scx200_acb_machine(struct scx200_acb_iface *iface, u8 status)
iface->needs_reset = 1; iface->needs_reset = 1;
} }
static void scx200_acb_timeout(struct scx200_acb_iface *iface)
{
dev_err(&iface->adapter.dev, "timeout in state %s\n",
scx200_acb_state_name[iface->state]);
iface->state = state_idle;
iface->result = -EIO;
iface->needs_reset = 1;
}
#ifdef POLLED_MODE #ifdef POLLED_MODE
static void scx200_acb_poll(struct scx200_acb_iface *iface) static void scx200_acb_poll(struct scx200_acb_iface *iface)
{ {
u8 status = 0; u8 status;
unsigned long timeout; unsigned long timeout;
timeout = jiffies + POLL_TIMEOUT; timeout = jiffies + POLL_TIMEOUT;
...@@ -248,7 +236,12 @@ static void scx200_acb_poll(struct scx200_acb_iface *iface) ...@@ -248,7 +236,12 @@ static void scx200_acb_poll(struct scx200_acb_iface *iface)
msleep(10); msleep(10);
} }
scx200_acb_timeout(iface); dev_err(&iface->adapter.dev, "timeout in state %s\n",
scx200_acb_state_name[iface->state]);
iface->state = state_idle;
iface->result = -EIO;
iface->needs_reset = 1;
} }
#endif /* POLLED_MODE */ #endif /* POLLED_MODE */
...@@ -291,13 +284,8 @@ static s32 scx200_acb_smbus_xfer(struct i2c_adapter *adapter, ...@@ -291,13 +284,8 @@ static s32 scx200_acb_smbus_xfer(struct i2c_adapter *adapter,
break; break;
case I2C_SMBUS_BYTE: case I2C_SMBUS_BYTE:
if (rw == I2C_SMBUS_READ) {
len = 1; len = 1;
buffer = &data->byte; buffer = rw ? &data->byte : &command;
} else {
len = 1;
buffer = &command;
}
break; break;
case I2C_SMBUS_BYTE_DATA: case I2C_SMBUS_BYTE_DATA:
...@@ -331,9 +319,7 @@ static s32 scx200_acb_smbus_xfer(struct i2c_adapter *adapter, ...@@ -331,9 +319,7 @@ static s32 scx200_acb_smbus_xfer(struct i2c_adapter *adapter,
down(&iface->sem); down(&iface->sem);
iface->address_byte = address<<1; iface->address_byte = (address << 1) | rw;
if (rw == I2C_SMBUS_READ)
iface->address_byte |= 1;
iface->command = command; iface->command = command;
iface->ptr = buffer; iface->ptr = buffer;
iface->len = len; iface->len = len;
...@@ -433,7 +419,7 @@ static int __init scx200_acb_create(int base, int index) ...@@ -433,7 +419,7 @@ static int __init scx200_acb_create(int base, int index)
{ {
struct scx200_acb_iface *iface; struct scx200_acb_iface *iface;
struct i2c_adapter *adapter; struct i2c_adapter *adapter;
int rc = 0; int rc;
char description[64]; char description[64];
iface = kzalloc(sizeof(*iface), GFP_KERNEL); iface = kzalloc(sizeof(*iface), GFP_KERNEL);
...@@ -459,14 +445,14 @@ static int __init scx200_acb_create(int base, int index) ...@@ -459,14 +445,14 @@ static int __init scx200_acb_create(int base, int index)
printk(KERN_ERR NAME ": can't allocate io 0x%x-0x%x\n", printk(KERN_ERR NAME ": can't allocate io 0x%x-0x%x\n",
base, base + 8-1); base, base + 8-1);
rc = -EBUSY; rc = -EBUSY;
goto errout; goto errout_free;
} }
iface->base = base; iface->base = base;
rc = scx200_acb_probe(iface); rc = scx200_acb_probe(iface);
if (rc) { if (rc) {
printk(KERN_WARNING NAME ": probe failed\n"); printk(KERN_WARNING NAME ": probe failed\n");
goto errout; goto errout_release;
} }
scx200_acb_reset(iface); scx200_acb_reset(iface);
...@@ -474,7 +460,7 @@ static int __init scx200_acb_create(int base, int index) ...@@ -474,7 +460,7 @@ static int __init scx200_acb_create(int base, int index)
if (i2c_add_adapter(adapter) < 0) { if (i2c_add_adapter(adapter) < 0) {
printk(KERN_ERR NAME ": failed to register\n"); printk(KERN_ERR NAME ": failed to register\n");
rc = -ENODEV; rc = -ENODEV;
goto errout; goto errout_release;
} }
lock_kernel(); lock_kernel();
...@@ -484,12 +470,11 @@ static int __init scx200_acb_create(int base, int index) ...@@ -484,12 +470,11 @@ static int __init scx200_acb_create(int base, int index)
return 0; return 0;
errout: errout_release:
if (iface) {
if (iface->base)
release_region(iface->base, 8); release_region(iface->base, 8);
errout_free:
kfree(iface); kfree(iface);
} errout:
return rc; return rc;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment