Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1607767

Re: [PATCH v3 2/2] staging: iio: ade7753: Replace mlock with driver private lock

Show all headers | View raw

On Thu, Mar 23, 2017 at 1:55 AM, Jonathan Cameron <jic23@kernel.org> wrote:
> On 21/03/17 18:03, simran singhal wrote:
>> The IIO subsystem is redefining iio_dev->mlock to be used by
>> the IIO core only for protecting device operating mode changes.
>> ie. Changes between INDIO_DIRECT_MODE, INDIO_BUFFER_* modes.
>>
>> In this driver, mlock was being used to protect hardware state
>> changes.  Replace it with a lock in the devices global data.
>>
>> Signed-off-by: simran singhal <singhalsimran0@gmail.com>
> Mutex is not initialized...

Mutex is already initialized in ade7753_probe().

>> ---
>>  drivers/staging/iio/meter/ade7753.c | 6 ++++--
>>  1 file changed, 4 insertions(+), 2 deletions(-)
>>
>> diff --git a/drivers/staging/iio/meter/ade7753.c b/drivers/staging/iio/meter/ade7753.c
>> index b71fbd3..9674e05 100644
>> --- a/drivers/staging/iio/meter/ade7753.c
>> +++ b/drivers/staging/iio/meter/ade7753.c
>> @@ -80,11 +80,13 @@
>>   * @us:         actual spi_device
>>   * @tx:         transmit buffer
>>   * @rx:         receive buffer
>> + * @lock:       protect sensor state
>>   * @buf_lock:       mutex to protect tx and rx
>>   **/
>>  struct ade7753_state {
>>       struct spi_device   *us;
>>       struct mutex        buf_lock;
>> +     struct mutex        lock;  /* protect sensor state */
>>       u8          tx[ADE7753_MAX_TX] ____cacheline_aligned;
>>       u8          rx[ADE7753_MAX_RX];
>>  };
>> @@ -484,7 +486,7 @@ static ssize_t ade7753_write_frequency(struct device *dev,
>>       if (!val)
>>               return -EINVAL;
>>
>> -     mutex_lock(&indio_dev->mlock);
>> +     mutex_lock(&st->lock);
>>
>>       t = 27900 / val;
>>       if (t > 0)
>> @@ -505,7 +507,7 @@ static ssize_t ade7753_write_frequency(struct device *dev,
>>       ret = ade7753_spi_write_reg_16(dev, ADE7753_MODE, reg);
>>
>>  out:
>> -     mutex_unlock(&indio_dev->mlock);
>> +     mutex_unlock(&st->lock);
>>
>>       return ret ? ret : len;
>>  }
>>
>

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

[PATCH v3 0/2] Replace mlock with private lock and delete whitespaces simran singhal <singhalsimran0@gmail.com> - 2017-03-21 19:10 +0100
  [PATCH v3 2/2] staging: iio: ade7753: Replace mlock with driver private lock simran singhal <singhalsimran0@gmail.com> - 2017-03-21 19:10 +0100
    Re: [PATCH v3 2/2] staging: iio: ade7753: Replace mlock with driver  private lock Jonathan Cameron <jic23@kernel.org> - 2017-03-22 21:30 +0100
      Re: [PATCH v3 2/2] staging: iio: ade7753: Replace mlock with driver private lock Jonathan Cameron <jic23@jic23.retrosnub.co.uk> - 2017-03-23 19:20 +0100
      Re: [PATCH v3 2/2] staging: iio: ade7753: Replace mlock with driver  private lock SIMRAN SINGHAL <singhalsimran0@gmail.com> - 2017-03-23 19:20 +0100
  Re: [Outreachy kernel] [PATCH v3 0/2] Replace mlock with private  lock and delete whitespaces Alison Schofield <amsfield22@gmail.com> - 2017-03-21 20:00 +0100

csiph-web