Hi Wolfram,
On Thu, 15 May 2008 16:35:27 +0200, Wolfram Sang wrote:
> Make the driver check and report error cases when reading from or writing to
> the chip. It used to assume 'always success' and could even deliver bogus
> values.
>
> Signed-off-by: Wolfram Sang <[EMAIL PROTECTED]>
> ---
>
> The PCF on my system seems broken, it does not respond (and I can't probe as
> my
> master doesn't support smbus_quick). The broken chip went unnoticed as the
> driver reported some (= bogus) values. So, I can only test the properly
> reported error cases, hopefully someone else can confirm the working case.
> (Michael and Bart, sorry for double post)
>
> drivers/i2c/chips/pcf8575.c | 29 +++++++++++++++++++++--------
> 1 files changed, 21 insertions(+), 8 deletions(-)
>
> diff --git a/drivers/i2c/chips/pcf8575.c b/drivers/i2c/chips/pcf8575.c
> index 3ea08ac..4a4247d 100644
> --- a/drivers/i2c/chips/pcf8575.c
> +++ b/drivers/i2c/chips/pcf8575.c
> @@ -67,15 +67,22 @@ static ssize_t show_read(struct device *dev, struct
> device_attribute *attr,
> char *buf)
> {
> struct i2c_client *client = to_i2c_client(dev);
> + int status, retval = -EIO;
> u16 val;
> u8 iopin_state[2];
>
> - i2c_master_recv(client, iopin_state, 2);
> + status = i2c_master_recv(client, iopin_state, 2);
>
> - val = iopin_state[0];
> - val |= iopin_state[1] << 8;
> + if (status == 2) {
> + val = iopin_state[0];
> + val |= iopin_state[1] << 8;
> + return sprintf(buf, "%u\n", val);
> + }
> +
> + if (status < 0)
> + retval = status;
>
> - return sprintf(buf, "%u\n", val);
> + return retval;
> }
By handling the errors returned by i2c_master_recv() and returning
quicly, I believe that you should be able to make a much smaller patch,
in particular no need to reindent the code and no need for 2 additional
local variables.
>
> static DEVICE_ATTR(read, S_IRUGO, show_read, NULL);
> @@ -95,19 +102,25 @@ static ssize_t set_write(struct device *dev, struct
> device_attribute *attr,
> struct i2c_client *client = to_i2c_client(dev);
> struct pcf8575_data *data = i2c_get_clientdata(client);
> unsigned long val = simple_strtoul(buf, NULL, 10);
> + int status, retval = -EIO;
> u8 iopin_state[2];
>
> if (val > 0xffff)
> return -EINVAL;
>
> - data->write = val;
> -
> iopin_state[0] = val & 0xFF;
> iopin_state[1] = val >> 8;
>
> - i2c_master_send(client, iopin_state, 2);
> + status = i2c_master_send(client, iopin_state, 2);
> +
> + if (status == 2)
> + retval = count;
> + else if (status < 0)
> + retval = status;
> +
> + data->write = (status == 2) ? val : retval;
>
> - return count;
> + return retval;
> }
While not as obvious as for the read case, here too I think that you
could make it slightly more simple. The fact that you have to test for
status == 2 twice while it is the most likely case, doesn't look good.
Another note: setting data->write to an error value may not be the best
thing to do. How does the chip react if write to it fails for some
reason? My guess is that the write will be ignored and the output will
stay whatever it was before. If I am right then leaving data->write
unchanged is the right thing to do on write error.
--
Jean Delvare
_______________________________________________
i2c mailing list
[email protected]
http://lists.lm-sensors.org/mailman/listinfo/i2c
