2010-06-22 14:10:22

by Guenter Roeck

Subject: [PATCH v2] i2c/mips: Fix error return codes from Sibyte i2c bus driver

Sibyte i2c bus driver returns non-descriptive error values.
Update to return error values as defined in Documentation/i2c/fault-codes.

Signed-off-by: Guenter Roeck <[email protected]>
---
v2: Return -ENXIO for missing ACK and -EIO for other errors
---
drivers/i2c/busses/i2c-sibyte.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/i2c/busses/i2c-sibyte.c b/drivers/i2c/busses/i2c-sibyte.c
index 3d76a18..0fe505d 100644
--- a/drivers/i2c/busses/i2c-sibyte.c
+++ b/drivers/i2c/busses/i2c-sibyte.c
@@ -94,7 +94,7 @@ static int smbus_xfer(struct i2c_adapter *i2c_adap, u16 addr,
}
break;
default:
- return -1; /* XXXKW better error code? */
+ return -EOPNOTSUPP;
}

while (csr_in32(SMB_CSR(adap, R_SMB_STATUS)) & M_SMB_BUSY)
@@ -104,7 +104,7 @@ static int smbus_xfer(struct i2c_adapter *i2c_adap, u16 addr,
if (error & M_SMB_ERROR) {
/* Clear error bit by writing a 1 */
csr_out32(M_SMB_ERROR, SMB_CSR(adap, R_SMB_STATUS));
- return -1; /* XXXKW better error code? */
+ return (error & M_SMB_ERROR_TYPE) ? -EIO : -ENXIO;
}

if (data_bytes == 1)
--
1.7.0.87.g0901d

2010-06-22 18:10:10

by Jean Delvare

Subject: Re: [PATCH v2] i2c/mips: Fix error return codes from Sibyte i2c bus driver

Hi Guenter,

On Tue, 22 Jun 2010 07:09:08 -0700, Guenter Roeck wrote:
> Sibyte i2c bus driver returns non-descriptive error values.
> Update to return error values as defined in Documentation/i2c/fault-codes.
>
> Signed-off-by: Guenter Roeck <[email protected]>
> ---
> v2: Return -ENXIO for missing ACK and -EIO for other errors
> ---
> drivers/i2c/busses/i2c-sibyte.c | 4 ++--
> 1 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/i2c/busses/i2c-sibyte.c b/drivers/i2c/busses/i2c-sibyte.c
> index 3d76a18..0fe505d 100644
> --- a/drivers/i2c/busses/i2c-sibyte.c
> +++ b/drivers/i2c/busses/i2c-sibyte.c
> @@ -94,7 +94,7 @@ static int smbus_xfer(struct i2c_adapter *i2c_adap, u16 addr,
> }
> break;
> default:
> - return -1; /* XXXKW better error code? */
> + return -EOPNOTSUPP;
> }
>
> while (csr_in32(SMB_CSR(adap, R_SMB_STATUS)) & M_SMB_BUSY)
> @@ -104,7 +104,7 @@ static int smbus_xfer(struct i2c_adapter *i2c_adap, u16 addr,
> if (error & M_SMB_ERROR) {
> /* Clear error bit by writing a 1 */
> csr_out32(M_SMB_ERROR, SMB_CSR(adap, R_SMB_STATUS));
> - return -1; /* XXXKW better error code? */
> + return (error & M_SMB_ERROR_TYPE) ? -EIO : -ENXIO;
> }
>
> if (data_bytes == 1)

Very nice, patch applied, thanks.

--
Jean Delvare