On Thu, 9 Sep 2021 11:45:36 +0200 Jacopo Mondi <jacopo@xxxxxxxxxx> wrote: > Add support for the Senseair Sunrise 006-0-0007 driver through the > IIO subsystem. > > Datasheet: https://rmtplusstoragesenseair.blob.core.windows.net/docs/Dev/publicerat/TDE5531.pdf > Signed-off-by: Jacopo Mondi <jacopo@xxxxxxxxxx> Given you will be doing a v6 anyway, I noticed one small place inline where you can reduce the scope of the lock and hence simplify error paths a bit (it occurs a few times in similar functions). Regmap stuff looks acceptable to me, though if a better way comes from Peter's comments even better! Thanks, Jonathan > + > +/* Custom regmap read/write operations: perform unlocked access to the i2c bus. */ > + > +static int sunrise_regmap_read(void *context, const void *reg_buf, > + size_t reg_size, void *val_buf, size_t val_size) > +{ > + struct i2c_client *client = context; > + union i2c_smbus_data data; > + int ret; > + > + memset(&data, 0, sizeof(data)); > + data.block[0] = val_size; > + > + /* > + * Wake up sensor by sending sensor address: START, sensor address, > + * STOP. Sensor will not ACK this byte. > + * > + * The chip enters a low power state after 15msec without > + * communications or after a complete read/write sequence. > + */ > + __i2c_smbus_xfer(client->adapter, client->addr, I2C_M_IGNORE_NAK, > + I2C_SMBUS_WRITE, 0, I2C_SMBUS_QUICK, NULL); > + > + ret = __i2c_smbus_xfer(client->adapter, client->addr, client->flags, > + I2C_SMBUS_READ, ((u8 *)reg_buf)[0], > + I2C_SMBUS_I2C_BLOCK_DATA, &data); > + if (ret < 0) > + return ret; > + > + memcpy(val_buf, &data.block[1], data.block[0]); > + > + return 0; > +} > + > +static int sunrise_regmap_write(void *context, const void *val_buf, size_t count) > +{ > + struct i2c_client *client = context; > + union i2c_smbus_data data; > + > + /* Discard reg address from values count. */ > + if (count < 1) > + return -EINVAL; > + count--; > + > + memset(&data, 0, sizeof(data)); > + data.block[0] = count; > + memcpy(&data.block[1], (u8 *)val_buf + 1, count); > + > + __i2c_smbus_xfer(client->adapter, client->addr, I2C_M_IGNORE_NAK, > + I2C_SMBUS_WRITE, 0, I2C_SMBUS_QUICK, NULL); > + > + return __i2c_smbus_xfer(client->adapter, client->addr, client->flags, > + I2C_SMBUS_WRITE, ((u8 *)val_buf)[0], > + I2C_SMBUS_I2C_BLOCK_DATA, &data); > +} This didn't end up looking too bad :) ... > + > +static ssize_t sunrise_cal_background_write(struct iio_dev *iiodev, > + uintptr_t private, > + const struct iio_chan_spec *chan, > + const char *buf, size_t len) > +{ > + struct sunrise_dev *sunrise = iio_priv(iiodev); > + bool enable; > + int ret; > + > + mutex_lock(&sunrise->lock); > + ret = kstrtobool(buf, &enable); > + if (ret) > + goto out_unlock; > + > + if (!enable) > + goto out_unlock; Trivial: Move these outside the lock (as only use local variables) and then return directly from them. That gets rid of the need for the label as well. Same for other cases that look like this... > + > + ret = sunrise_calibrate(sunrise, &calib_data[SUNRISE_CALIBRATION_BACKGROUND]); > + > +out_unlock: > + mutex_unlock(&sunrise->lock); > + if (ret) > + return ret; > + > + return len; > +} > + Thanks, Jonathan
