iio: cros_ec: Remove replacing error code with -EIO

Due to an API misread, error code can be different for -EIO when reading
a sysfs entry. Return the error reported by the cros_ec stack.

Check the proper error message (protocol error, not supported) is
reported when there is an error returned by the EC stack.

Signed-off-by: Gwendal Grignou <gwendal@chromium.org>
Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>

diff --git a/drivers/iio/common/cros_ec_sensors/cros_ec_sensors_core.c b/drivers/iio/common/cros_ec_sensors/cros_ec_sensors_core.c
index 96d5aa1f4bd5534dfa7fed42048c26133b3aee03..8d43965c3b9aef75805b7719cc794f30ec0fc147 100644 (file)
--- a/drivers/iio/common/cros_ec_sensors/cros_ec_sensors_core.c
+++ b/drivers/iio/common/cros_ec_sensors/cros_ec_sensors_core.c
@@ -33,6 +33,7 @@ int cros_ec_sensors_core_init(struct platform_device *pdev,
        struct cros_ec_sensors_core_state *state = iio_priv(indio_dev);
        struct cros_ec_dev *ec = dev_get_drvdata(pdev->dev.parent);
        struct cros_ec_sensor_platform *sensor_platform = dev_get_platdata(dev);
+       int ret;
 
        platform_set_drvdata(pdev, indio_dev);
 
@@ -60,9 +61,10 @@ int cros_ec_sensors_core_init(struct platform_device *pdev,
 
                state->param.cmd = MOTIONSENSE_CMD_INFO;
                state->param.info.sensor_num = sensor_platform->sensor_num;
-               if (cros_ec_motion_send_host_cmd(state, 0)) {
+               ret = cros_ec_motion_send_host_cmd(state, 0);
+               if (ret) {
                        dev_warn(dev, "Can not access sensor info\n");
-                       return -EIO;
+                       return ret;
                }
                state->type = state->resp->info.type;
                state->loc = state->resp->info.location;
@@ -86,7 +88,7 @@ int cros_ec_motion_send_host_cmd(struct cros_ec_sensors_core_state *state,
 
        ret = cros_ec_cmd_xfer_status(state->ec, state->msg);
        if (ret < 0)
-               return -EIO;
+               return ret;
 
        if (ret &&
            state->resp != (struct ec_response_motion_sense *)state->msg->data)
@@ -396,7 +398,7 @@ int cros_ec_sensors_core_read(struct cros_ec_sensors_core_state *st,
                          struct iio_chan_spec const *chan,
                          int *val, int *val2, long mask)
 {
-       int ret = IIO_VAL_INT;
+       int ret;
 
        switch (mask) {
        case IIO_CHAN_INFO_SAMP_FREQ:
@@ -404,22 +406,27 @@ int cros_ec_sensors_core_read(struct cros_ec_sensors_core_state *st,
                st->param.ec_rate.data =
                        EC_MOTION_SENSE_NO_VALUE;
 
-               if (cros_ec_motion_send_host_cmd(st, 0))
-                       ret = -EIO;
-               else
-                       *val = st->resp->ec_rate.ret;
+               ret = cros_ec_motion_send_host_cmd(st, 0);
+               if (ret)
+                       break;
+
+               *val = st->resp->ec_rate.ret;
+               ret = IIO_VAL_INT;
                break;
        case IIO_CHAN_INFO_FREQUENCY:
                st->param.cmd = MOTIONSENSE_CMD_SENSOR_ODR;
                st->param.sensor_odr.data =
                        EC_MOTION_SENSE_NO_VALUE;
 
-               if (cros_ec_motion_send_host_cmd(st, 0))
-                       ret = -EIO;
-               else
-                       *val = st->resp->sensor_odr.ret;
+               ret = cros_ec_motion_send_host_cmd(st, 0);
+               if (ret)
+                       break;
+
+               *val = st->resp->sensor_odr.ret;
+               ret = IIO_VAL_INT;
                break;
        default:
+               ret = -EINVAL;
                break;
        }
 
@@ -431,7 +438,7 @@ int cros_ec_sensors_core_write(struct cros_ec_sensors_core_state *st,
                               struct iio_chan_spec const *chan,
                               int val, int val2, long mask)
 {
-       int ret = 0;
+       int ret;
 
        switch (mask) {
        case IIO_CHAN_INFO_FREQUENCY:
@@ -441,17 +448,16 @@ int cros_ec_sensors_core_write(struct cros_ec_sensors_core_state *st,
                /* Always roundup, so caller gets at least what it asks for. */
                st->param.sensor_odr.roundup = 1;
 
-               if (cros_ec_motion_send_host_cmd(st, 0))
-                       ret = -EIO;
+               ret = cros_ec_motion_send_host_cmd(st, 0);
                break;
        case IIO_CHAN_INFO_SAMP_FREQ:
                st->param.cmd = MOTIONSENSE_CMD_EC_RATE;
                st->param.ec_rate.data = val;
 
-               if (cros_ec_motion_send_host_cmd(st, 0))
-                       ret = -EIO;
-               else
-                       st->curr_sampl_freq = val;
+               ret = cros_ec_motion_send_host_cmd(st, 0);
+               if (ret)
+                       break;
+               st->curr_sampl_freq = val;
                break;
        default:
                ret = -EINVAL;

diff --git a/drivers/iio/light/cros_ec_light_prox.c b/drivers/iio/light/cros_ec_light_prox.c
index b81746a99f1f5b3c44e9151774cef140318b3570..965f346d7d6402e22b88cc54dc2252d03815e8b0 100644 (file)
--- a/drivers/iio/light/cros_ec_light_prox.c
+++ b/drivers/iio/light/cros_ec_light_prox.c
@@ -42,7 +42,7 @@ static int cros_ec_light_prox_read(struct iio_dev *indio_dev,
        struct cros_ec_light_prox_state *st = iio_priv(indio_dev);
        u16 data = 0;
        s64 val64;
-       int ret = IIO_VAL_INT;
+       int ret;
        int idx = chan->scan_index;
 
        mutex_lock(&st->core.cmd_lock);
@@ -50,23 +50,22 @@ static int cros_ec_light_prox_read(struct iio_dev *indio_dev,
        switch (mask) {
        case IIO_CHAN_INFO_RAW:
                if (chan->type == IIO_PROXIMITY) {
-                       if (cros_ec_sensors_read_cmd(indio_dev, 1 << idx,
-                                                    (s16 *)&data) < 0) {
-                               ret = -EIO;
+                       ret = cros_ec_sensors_read_cmd(indio_dev, 1 << idx,
+                                                    (s16 *)&data);
+                       if (ret)
                                break;
-                       }
                        *val = data;
+                       ret = IIO_VAL_INT;
                } else {
                        ret = -EINVAL;
                }
                break;
        case IIO_CHAN_INFO_PROCESSED:
                if (chan->type == IIO_LIGHT) {
-                       if (cros_ec_sensors_read_cmd(indio_dev, 1 << idx,
-                                                    (s16 *)&data) < 0) {
-                               ret = -EIO;
+                       ret = cros_ec_sensors_read_cmd(indio_dev, 1 << idx,
+                                                    (s16 *)&data);
+                       if (ret)
                                break;
-                       }
                        /*
                         * The data coming from the light sensor is
                         * pre-processed and represents the ambient light
@@ -82,16 +81,16 @@ static int cros_ec_light_prox_read(struct iio_dev *indio_dev,
                st->core.param.cmd = MOTIONSENSE_CMD_SENSOR_OFFSET;
                st->core.param.sensor_offset.flags = 0;
 
-               if (cros_ec_motion_send_host_cmd(&st->core, 0)) {
-                       ret = -EIO;
+               ret = cros_ec_motion_send_host_cmd(&st->core, 0);
+               if (ret)
                        break;
-               }
 
                /* Save values */
                st->core.calib[0].offset =
                        st->core.resp->sensor_offset.offset[0];
 
                *val = st->core.calib[idx].offset;
+               ret = IIO_VAL_INT;
                break;
        case IIO_CHAN_INFO_CALIBSCALE:
                /*
@@ -102,10 +101,9 @@ static int cros_ec_light_prox_read(struct iio_dev *indio_dev,
                st->core.param.cmd = MOTIONSENSE_CMD_SENSOR_RANGE;
                st->core.param.sensor_range.data = EC_MOTION_SENSE_NO_VALUE;
 
-               if (cros_ec_motion_send_host_cmd(&st->core, 0)) {
-                       ret = -EIO;
+               ret = cros_ec_motion_send_host_cmd(&st->core, 0);
+               if (ret)
                        break;
-               }
 
                val64 = st->core.resp->sensor_range.ret;
                *val = val64 >> 16;
@@ -128,7 +126,7 @@ static int cros_ec_light_prox_write(struct iio_dev *indio_dev,
                               int val, int val2, long mask)
 {
        struct cros_ec_light_prox_state *st = iio_priv(indio_dev);
-       int ret = 0;
+       int ret;
        int idx = chan->scan_index;
 
        mutex_lock(&st->core.cmd_lock);
@@ -143,14 +141,12 @@ static int cros_ec_light_prox_write(struct iio_dev *indio_dev,
                        st->core.calib[0].offset;
                st->core.param.sensor_offset.temp =
                                        EC_MOTION_SENSE_INVALID_CALIB_TEMP;
-               if (cros_ec_motion_send_host_cmd(&st->core, 0))
-                       ret = -EIO;
+               ret = cros_ec_motion_send_host_cmd(&st->core, 0);
                break;
        case IIO_CHAN_INFO_CALIBSCALE:
                st->core.param.cmd = MOTIONSENSE_CMD_SENSOR_RANGE;
                st->core.param.sensor_range.data = (val << 16) | (val2 / 100);
-               if (cros_ec_motion_send_host_cmd(&st->core, 0))
-                       ret = -EIO;
+               ret = cros_ec_motion_send_host_cmd(&st->core, 0);
                break;
        default:
                ret = cros_ec_sensors_core_write(&st->core, chan, val, val2,

diff --git a/drivers/iio/pressure/cros_ec_baro.c b/drivers/iio/pressure/cros_ec_baro.c
index d3acba7ba58262a200b04f36d46c290b7e8a18f3..70148624db648f7dd32933636de6f6498fcd43e8 100644 (file)
--- a/drivers/iio/pressure/cros_ec_baro.c
+++ b/drivers/iio/pressure/cros_ec_baro.c
@@ -39,26 +39,29 @@ static int cros_ec_baro_read(struct iio_dev *indio_dev,
 {
        struct cros_ec_baro_state *st = iio_priv(indio_dev);
        u16 data = 0;
-       int ret = IIO_VAL_INT;
+       int ret;
        int idx = chan->scan_index;
 
        mutex_lock(&st->core.cmd_lock);
 
        switch (mask) {
        case IIO_CHAN_INFO_RAW:
-               if (cros_ec_sensors_read_cmd(indio_dev, 1 << idx,
-                                            (s16 *)&data) < 0)
-                       ret = -EIO;
+               ret = cros_ec_sensors_read_cmd(indio_dev, 1 << idx,
+                                            (s16 *)&data);
+               if (ret)
+                       break;
+
                *val = data;
+               ret = IIO_VAL_INT;
                break;
        case IIO_CHAN_INFO_SCALE:
                st->core.param.cmd = MOTIONSENSE_CMD_SENSOR_RANGE;
                st->core.param.sensor_range.data = EC_MOTION_SENSE_NO_VALUE;
 
-               if (cros_ec_motion_send_host_cmd(&st->core, 0)) {
-                       ret = -EIO;
+               ret = cros_ec_motion_send_host_cmd(&st->core, 0);
+               if (ret)
                        break;
-               }
+
                *val = st->core.resp->sensor_range.ret;
 
                /* scale * in_pressure_raw --> kPa */