From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: ARC-Seal: i=1; a=rsa-sha256; t=1516463095; cv=none; d=google.com; s=arc-20160816; b=P84XGvqlv5W1yXcb+z1Fkss/9tyF9JeuJLdC8UttE8BwRonjdNrAGMiErGHLK97sye rXhKlDU0+jZ/3H85hKmEUGnP6+JYX506IbEkL6UsqRGlhgOXUqYhfMfB3Uv43mo5UTf3 2Y1RYi/OqyKDu52/qQTLCfVb+vZ3Dk2qmN0C/PZfh5kFZ8GgH4BwbqHERBqYqvEUxjNC JD174s3uqtRnfvJMxEfQTE5q9f76HIJUzYed0Yk658oAXk1wMYbvAua6sRGtUVLfZ1fp NxD3dItEijdcJdpPI5t9Qw/vOHus9x3phVIP+jYtd3OFgNyuo7KN+Ms0MYNywqg4U5ap 7Pig== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=message-id:date:subject:cc:to:from:dkim-signature :arc-authentication-results; bh=NbmMoMyMBsDtUrajM0MGpVo1jRy9Ky+XwUWx0e/Ovuc=; b=hGU2pdrBXIG5ueiIs5aZV2xZkB5wLTCZHVtHehRaRqy/U99lN05TZSgDU/d9epqTFY V5mGUYLiV4roj7HjGzQrGafnQ5D9g8tp8+AyTplGarGoWWT6l87GGHHqDzhJdVyGo1XW ZgAWgFO5LavrqGlaUOEUNr+cLNmY9rBCtK9rpqcsczIDPkWEcLhNCSWmGtfRPlnkBtJR lF8myS3sqhNZ2ECmXcnkOcwZqgyDNjXIOSAU9hyb2c8uAqWwGjsZsv7hVUZKIMO9cKae qkSso8VfB4/GZO6sHVQSMN4kigfFlNNUnLoI443qATCLCWTtFkgPCbbp42lNVf76BpjC r9ow== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=X45kMmpH; spf=pass (google.com: domain of shreeya.patel23498@gmail.com designates 209.85.220.65 as permitted sender) smtp.mailfrom=shreeya.patel23498@gmail.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=gmail.com Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=X45kMmpH; spf=pass (google.com: domain of shreeya.patel23498@gmail.com designates 209.85.220.65 as permitted sender) smtp.mailfrom=shreeya.patel23498@gmail.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=gmail.com X-Google-Smtp-Source: AH8x225EW09v9F9OQ9ibL2tFowGKluxvSyFulpVqHehdrofy6LAkVv7joSbb/PnZU0/cYXnYEA0c3A== From: Shreeya Patel To: lars@metafoo.de, Michael.Hennerich@analog.com, jic23@kernel.org, knaack.h@gmx.de, pmeerw@pmeerw.net, gregkh@linuxfoundation.org, linux-iio@vger.kernel.org, devel@driverdev.osuosl.org, linux-kernel@vger.kernel.org Cc: Shreeya Patel Subject: [PATCH] Staging: iio: ade7758: Replace mlock with buf_lock Date: Sat, 20 Jan 2018 21:14:48 +0530 Message-Id: <1516463088-2514-1-git-send-email-shreeya.patel23498@gmail.com> X-Mailer: git-send-email 2.7.4 X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: =?utf-8?q?1590126806601643217?= X-GMAIL-MSGID: =?utf-8?q?1590126806601643217?= X-Mailing-List: linux-kernel@vger.kernel.org List-ID: iio_dev->mlock is to be used only by the IIO core for protecting device mode changes between INDIO_DIRECT and INDIO_BUFFER. This patch replaces the use of mlock with the already established buf_lock mutex. Signed-off-by: Shreeya Patel --- drivers/staging/iio/meter/ade7758_core.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/drivers/staging/iio/meter/ade7758_core.c b/drivers/staging/iio/meter/ade7758_core.c index 7b7ffe5..1a866cc 100644 --- a/drivers/staging/iio/meter/ade7758_core.c +++ b/drivers/staging/iio/meter/ade7758_core.c @@ -523,12 +523,13 @@ static int ade7758_read_raw(struct iio_dev *indio_dev, long mask) { int ret; + struct ade7758_state *st = iio_priv(indio_dev); switch (mask) { case IIO_CHAN_INFO_SAMP_FREQ: - mutex_lock(&indio_dev->mlock); + mutex_lock(&st->buf_lock); ret = ade7758_read_samp_freq(&indio_dev->dev, val); - mutex_unlock(&indio_dev->mlock); + mutex_unlock(&st->buf_lock); return ret; default: return -EINVAL; @@ -542,14 +543,15 @@ static int ade7758_write_raw(struct iio_dev *indio_dev, int val, int val2, long mask) { int ret; + struct ade7758_state *st = iio_priv(indio_dev); switch (mask) { case IIO_CHAN_INFO_SAMP_FREQ: if (val2) return -EINVAL; - mutex_lock(&indio_dev->mlock); + mutex_lock(&st->buf_lock); ret = ade7758_write_samp_freq(&indio_dev->dev, val); - mutex_unlock(&indio_dev->mlock); + mutex_unlock(&st->buf_lock); return ret; default: return -EINVAL; -- 2.7.4